--- a/tests/test-merge-revert2.out Tue Jan 24 14:49:19 2006 +1300
+++ b/tests/test-merge-revert2.out Tue Jan 24 15:02:10 2006 +1300
@@ -11,7 +11,7 @@
diff -r f4d7a8c73d23 file1
--- a/file1
+++ b/file1
-@@ -1,3 +1,7 @@
+@@ -1,3 +1,7 @@ added file1
added file1
another line of text
+<<<<<<<