Mercurial Mercurial > pub > hg > evolve / 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-stabilize-result.t
branchmercurial-3.5
changeset 1600 0d8973818980
parent 1516 c4f8a2916e43
child 1608 e359d33856c3
child 1698 dd6f090b7342 
--- a/tests/test-stabilize-result.t	Thu Feb 04 10:24:26 2016 +0000
+++ b/tests/test-stabilize-result.t	Thu Feb 04 11:07:44 2016 +0000
@@ -82,7 +82,8 @@
   move:[5] newer a
   atop:[7] changea
   merging a
-  warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
+  warning: conflicts during merge.
+  merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
   evolve failed!
   fix conflict and run "hg evolve --continue" or use "hg update -C" to abort
   abort: unresolved merge conflicts (see hg help resolve)
@@ -357,7 +358,8 @@
   with: [21] More addition
   base: [15] More addition
   merging a
-  warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
+  warning: conflicts during merge.
+  merging a 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
   abort: merge conflict between several amendments (this is not automated yet)
evolve