Mercurial > hg > pyhgsh

view tests/test-merge-revert2.out @ 1847:94498a262d15

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix annotate for removed files walk in the manifest files instead of the working dir files when running annotate
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Tue, 07 Mar 2006 20:37:27 +0100
parents 3b1b44b917f4
children 7544700fd931
line wrap: on
line source

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
 added file1
 another line of text
+<<<<<<<
+changed file1 different
+=======
 changed file1
+>>>>>>>
M file1
f4d7a8c73d23+ tip
f4d7a8c73d23 tip
f4d7a8c73d23 tip
f4d7a8c73d23 tip