--- a/tests/test-merge-revert2.out Mon Mar 13 12:22:55 2006 +0100
+++ b/tests/test-merge-revert2.out Mon Mar 13 13:05:41 2006 +0100
@@ -1,14 +1,14 @@
-1:f4d7a8c73d23
-0:232e179b3f29
-f4d7a8c73d23 tip
-232e179b3f29
-232e179b3f29+
-232e179b3f29
-f4d7a8c73d23 tip
+1:f248da0d4c3e
+0:9eca13a34789
+f248da0d4c3e tip
+9eca13a34789
+9eca13a34789+
+9eca13a34789
+f248da0d4c3e tip
merge: warning: conflicts during merge
merging file1
merging file1 failed!
-diff -r f4d7a8c73d23 file1
+diff -r f248da0d4c3e file1
--- a/file1
+++ b/file1
@@ -1,3 +1,7 @@ added file1
@@ -20,7 +20,7 @@
changed file1
+>>>>>>>
M file1
-f4d7a8c73d23+ tip
-f4d7a8c73d23 tip
-f4d7a8c73d23 tip
-f4d7a8c73d23 tip
+f248da0d4c3e+ tip
+f248da0d4c3e tip
+f248da0d4c3e tip
+f248da0d4c3e tip