diff -r 1386a9cffc88 -r 93a4e72b4f83 tests/test-merge7.out
--- a/tests/test-merge7.out	Thu Apr 26 23:58:18 2007 -0700
+++ b/tests/test-merge7.out	Sat Apr 28 17:55:45 2007 -0300
@@ -33,11 +33,11 @@
   hg update -C 3
   hg merge 4
 one
-<<<<<<<
+<<<<<<< my
 two-point-five
 =======
 two-point-one
->>>>>>>
+>>>>>>> other
 three
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       7      0       0 01365c4cca56 000000000000 000000000000