diff -r 1386a9cffc88 -r 93a4e72b4f83 tests/test-merge-revert2.out
--- a/tests/test-merge-revert2.out	Thu Apr 26 23:58:18 2007 -0700
+++ b/tests/test-merge-revert2.out	Sat Apr 28 17:55:45 2007 -0300
@@ -23,11 +23,11 @@
 @@ -1,3 +1,7 @@ added file1
  added file1
  another line of text
-+<<<<<<<
++<<<<<<< my
 +changed file1 different
 +=======
  changed file1
-+>>>>>>>
++>>>>>>> other
 M file1
 f248da0d4c3e+ tip
 reverting file1