diff -r dac2edce4e4a -r 1e9451476bf8 tests/test-merge1.t
--- a/tests/test-merge1.t	Wed Oct 12 18:59:59 2011 -0500
+++ b/tests/test-merge1.t	Thu Oct 13 04:27:49 2011 +0200
@@ -110,8 +110,7 @@
   $ hg merge 2
   abort: outstanding uncommitted changes (use 'hg status' to list changes)
   [255]
-  $ echo %% merge expected!
-  %% merge expected!
+merge expected!
   $ hg merge -f 2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)