Mercurial Mercurial > mercurial / 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-merge7.out
changeset 3299 e7abcf3a7c5f
parent 3211 3fd098e0902d
child 3311 966632304dde 
--- a/tests/test-merge7.out	Mon Oct 09 21:04:25 2006 -0500
+++ b/tests/test-merge7.out	Mon Oct 09 21:27:04 2006 -0500
@@ -27,7 +27,7 @@
  test.txt: versions differ -> m
 merging test.txt
 resolving test.txt
-my test.txt@451c744aabcc other test.txt@a070d41e8360 ancestor test.txt@faaea63e63a9
+my test.txt@. other test.txt@a070d41e8360 ancestor test.txt@faaea63e63a9
 merging test.txt failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
 There are unresolved merges, you can redo the full merge using:
mercurial