diff --git a/tests/test-merge-revert2.out b/tests/test-merge-revert2.out --- a/tests/test-merge-revert2.out +++ b/tests/test-merge-revert2.out @@ -11,7 +11,7 @@ merging file1 failed! diff -r f4d7a8c73d23 file1 --- a/file1 +++ b/file1 -@@ -1,3 +1,7 @@ +@@ -1,3 +1,7 @@ added file1 added file1 another line of text +<<<<<<<