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-merge9.t
changeset 15501 2371f4aea665
parent 12346 3b165c127690
child 16913 f2719b387380 
--- a/tests/test-merge9.t	Sat Nov 12 02:08:01 2011 +0100
+++ b/tests/test-merge9.t	Wed Nov 16 18:04:19 2011 -0600
@@ -83,7 +83,7 @@
   $ hg resolve -a
   merging bar
   warning: conflicts during merge.
-  merging bar failed!
+  merging bar incomplete! (edit conflicts, then use 'hg resolve --mark')
   [1]
 
 after
mercurial