--- a/tests/test-merge-revert2.out
+++ b/tests/test-merge-revert2.out
@@ -23,11 +23,11 @@ diff -r f248da0d4c3e file1
 @@ -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