Mercurial > hg

view tests/test-merge-revert2.out @ 1966:f8b0e73e320f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hg status cleanups: Don't translate long options, remove stray semicolon.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 17 Mar 2006 18:19:05 +0100
parents 7544700fd931
children d436b21b20dc
line wrap: on
line source

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