Mercurial Mercurial > hg > mercurial-crew-with-dirclash / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-conflict.out
changeset 4385 93a4e72b4f83
parent 4361 46280c004f22 
--- a/tests/test-conflict.out
+++ b/tests/test-conflict.out
@@ -7,7 +7,9 @@ There are unresolved merges, you can red
   hg update -C 2
   hg merge 1
 e7fe8eb3e180+0d24b7662d3e+ tip
+<<<<<<< my
 something else
 =======
 something
+>>>>>>> other
 M a
mercurial-crew-with-dirclash