tests/test-merge-revert2.out
author bos@serpentine.internal.keyresearch.com
Mon, 29 Aug 2005 11:28:48 -0700
changeset 1148 fad2d091c74f
parent 925 5a034646e472
child 1637 3b1b44b917f4
permissions -rw-r--r--
Add test-grep.out file for now.

1:f4d7a8c73d23
0:232e179b3f29
f4d7a8c73d23 tip
232e179b3f29
232e179b3f29+
232e179b3f29
f4d7a8c73d23 tip
merge: warning: conflicts during merge
merging file1
merging file1 failed!
diff -r f4d7a8c73d23 file1
--- a/file1
+++ b/file1
@@ -1,3 +1,7 @@
 added file1
 another line of text
+<<<<<<<
+changed file1 different
+=======
 changed file1
+>>>>>>>
M file1
f4d7a8c73d23+ tip
f4d7a8c73d23 tip
f4d7a8c73d23 tip
f4d7a8c73d23 tip