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
changeset 1516 c4f8a2916e43
parent 1453 8ca31deb8db7
child 1607 3c7f98753e37
child 1600 0d8973818980
child 1631 7463f5880ce9 
--- a/tests/test-stabilize-result.t	Fri Oct 30 16:04:37 2015 +0000
+++ b/tests/test-stabilize-result.t	Fri Oct 30 15:48:13 2015 +0000
@@ -82,8 +82,7 @@
   move:[5] newer a
   atop:[7] changea
   merging a
-  warning: conflicts during merge.
-  merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging a! (edit, 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)
@@ -358,8 +357,7 @@
   with: [21] More addition
   base: [15] More addition
   merging a
-  warning: conflicts during merge.
-  merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging a! (edit, 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