--- a/tests/test-merge-tools.t	Wed Oct 12 18:59:59 2011 -0500
+++ b/tests/test-merge-tools.t	Thu Oct 13 04:27:49 2011 +0200
@@ -31,8 +31,7 @@
   $ hg commit -Am "revision 3"
   created new head
   $ echo "[merge-tools]" > .hg/hgrc
-  $ echo
-  
+
   $ beforemerge() {
   >   cat .hg/hgrc
   >   echo "# hg update -C 1"
@@ -44,7 +43,6 @@
   >   echo "# hg stat"
   >   hg stat
   >   rm -f f.orig
-  >   echo
   > }
   $ domerge() {
   >   beforemerge
@@ -52,14 +50,9 @@
   >   hg merge $*
   >   aftermerge
   > }
-  $ echo
-  
 
 Tool selection
 
-  $ echo
-  
-
 default is internal merge:
 
   $ beforemerge
@@ -88,7 +81,6 @@
   # hg stat
   M f
   ? f.orig
-  
 
 simplest hgrc using false for merge:
 
@@ -108,7 +100,6 @@
   # hg stat
   M f
   ? f.orig
-  
 
 true with higher .priority gets precedence:
 
@@ -127,7 +118,6 @@
   space
   # hg stat
   M f
-  
 
 unless lowered on command line:
 
@@ -147,7 +137,6 @@
   # hg stat
   M f
   ? f.orig
-  
 
 or false set higher on command line:
 
@@ -167,7 +156,6 @@
   # hg stat
   M f
   ? f.orig
-  
 
 or true.executable not found in PATH:
 
@@ -187,7 +175,6 @@
   # hg stat
   M f
   ? f.orig
-  
 
 or true.executable with bogus path:
 
@@ -207,7 +194,6 @@
   # hg stat
   M f
   ? f.orig
-  
 
 but true.executable set to cat found in PATH works:
 
@@ -233,7 +219,6 @@
   space
   # hg stat
   M f
-  
 
 and true.executable set to cat with path works:
 
@@ -258,15 +243,9 @@
   space
   # hg stat
   M f
-  
-  $ echo
-  
 
 Tool selection and merge-patterns
 
-  $ echo
-  
-
 merge-patterns specifies new tool false:
 
   $ domerge -r 2 --config merge-patterns.f=false
@@ -286,7 +265,6 @@
   # hg stat
   M f
   ? f.orig
-  
 
 merge-patterns specifies executable not found in PATH and gets warning:
 
@@ -308,7 +286,6 @@
   # hg stat
   M f
   ? f.orig
-  
 
 merge-patterns specifies executable with bogus path and gets warning:
 
@@ -330,15 +307,9 @@
   # hg stat
   M f
   ? f.orig
-  
-  $ echo
-  
 
 ui.merge overrules priority
 
-  $ echo
-  
-
 ui.merge specifies false:
 
   $ domerge -r 2 --config ui.merge=false
@@ -358,7 +329,6 @@
   # hg stat
   M f
   ? f.orig
-  
 
 ui.merge specifies internal:fail:
 
@@ -376,7 +346,6 @@
   space
   # hg stat
   M f
-  
 
 ui.merge specifies internal:local:
 
@@ -394,7 +363,6 @@
   space
   # hg stat
   M f
-  
 
 ui.merge specifies internal:other:
 
@@ -412,7 +380,6 @@
   space
   # hg stat
   M f
-  
 
 ui.merge specifies internal:prompt:
 
@@ -432,7 +399,6 @@
   space
   # hg stat
   M f
-  
 
 ui.merge specifies internal:dump:
 
@@ -455,7 +421,6 @@
   ? f.local
   ? f.orig
   ? f.other
-  
 
 f.base:
 
@@ -475,8 +440,6 @@
   revision 2
   space
   $ rm f.base f.local f.other
-  $ echo
-  
 
 ui.merge specifies internal:other but is overruled by pattern for false:
 
@@ -497,15 +460,9 @@
   # hg stat
   M f
   ? f.orig
-  
-  $ echo
-  
 
 Premerge
 
-  $ echo
-  
-
 ui.merge specifies internal:other but is overruled by --tool=false
 
   $ domerge -r 2 --config ui.merge=internal:other --tool=false
@@ -525,7 +482,7 @@
   # hg stat
   M f
   ? f.orig
-  
+
 HGMERGE specifies internal:other but is overruled by --tool=false
 
   $ HGMERGE=internal:other ; export HGMERGE
@@ -546,7 +503,7 @@
   # hg stat
   M f
   ? f.orig
-  
+
   $ unset HGMERGE # make sure HGMERGE doesn't interfere with remaining tests
 
 Default is silent simplemerge:
@@ -567,7 +524,6 @@
   revision 3
   # hg stat
   M f
-  
 
 .premerge=True is same:
 
@@ -587,7 +543,6 @@
   revision 3
   # hg stat
   M f
-  
 
 .premerge=False executes merge-tool:
 
@@ -613,16 +568,11 @@
   space
   # hg stat
   M f
-  
-  $ echo
-  
 
 Tool execution
 
-  $ echo
-  
-  $ echo '# set tools.args explicit to include $base $local $other $output:' # default '$local $base $other'
-  # set tools.args explicit to include $base $local $other $output:
+set tools.args explicit to include $base $local $other $output:
+
   $ beforemerge
   [merge-tools]
   false.whatever=
@@ -655,9 +605,9 @@
   space
   # hg stat
   M f
-  
-  $ echo '# Merge with "echo mergeresult > $local":'
-  # Merge with "echo mergeresult > $local":
+
+Merge with "echo mergeresult > $local":
+
   $ beforemerge
   [merge-tools]
   false.whatever=
@@ -673,9 +623,9 @@
   mergeresult
   # hg stat
   M f
-  
-  $ echo '# - and $local is the file f:'
-  # - and $local is the file f:
+
+- and $local is the file f:
+
   $ beforemerge
   [merge-tools]
   false.whatever=
@@ -691,9 +641,9 @@
   mergeresult
   # hg stat
   M f
-  
-  $ echo '# Merge with "echo mergeresult > $output" - the variable is a bit magic:'
-  # Merge with "echo mergeresult > $output" - the variable is a bit magic:
+
+Merge with "echo mergeresult > $output" - the variable is a bit magic:
+
   $ beforemerge
   [merge-tools]
   false.whatever=
@@ -709,7 +659,6 @@
   mergeresult
   # hg stat
   M f
-  
 
 Merge using tool with a path that must be quoted:
 
@@ -739,15 +688,9 @@
   space
   # hg stat
   M f
-  
-  $ echo
-  
 
 Merge post-processing
 
-  $ echo
-  
-
 cat is a bad merge-tool and doesn't change:
 
   $ domerge -y -r 2 --config merge-tools.true.checkchanged=1
@@ -775,4 +718,3 @@
   # hg stat
   M f
   ? f.orig
-