diff -r b860b116dea4 -r 3d1f9dcecdea tests/test-merge-revert2.out
--- a/tests/test-merge-revert2.out	Tue Jan 15 15:49:24 2008 -0600
+++ b/tests/test-merge-revert2.out	Wed Jan 16 11:14:24 2008 -0600
@@ -20,7 +20,7 @@
 diff -r f248da0d4c3e file1
 --- a/file1
 +++ b/file1
-@@ -1,3 +1,7 @@ added file1
+@@ -1,3 +1,7 @@
  added file1
  another line of text
 +<<<<<<< my