Mercurial Mercurial > test / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: give a special message for internal:merge failure (issue3105) stable
authorMatt Mackall <mpm@selenic.com>
Wed, 16 Nov 2011 18:04:19 -0600
branchstable
changeset 1024 0b56a38520af
parent 1022 34ebea1c49c9
child 1025 c1ee4cc36089
child 1026 e419c8a4862b
merge: give a special message for internal:merge failure (issue3105) [ original upstream message ]
tests/test-keyword.t file | annotate | diff | comparison | revisions 
--- a/tests/test-keyword.t	Wed Nov 16 03:45:14 2011 +0100
+++ b/tests/test-keyword.t	Wed Nov 16 18:04:19 2011 -0600
@@ -976,7 +976,7 @@
   $ hg merge
   merging m
   warning: conflicts during merge.
-  merging m failed!
+  merging m incomplete! (edit conflicts, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
test