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-conflict.t
changeset 1516 c4f8a2916e43
parent 1395 362e2c8c5677
child 1545 13701c3fed9c
child 1600 0d8973818980 
--- a/tests/test-stabilize-conflict.t	Fri Oct 30 16:04:37 2015 +0000
+++ b/tests/test-stabilize-conflict.t	Fri Oct 30 15:48:13 2015 +0000
@@ -127,8 +127,7 @@
   move:[5] babar count up to fifteen
   atop:[7] babar count up to ten
   merging babar
-  warning: conflicts during merge.
-  merging babar incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging babar! (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)
evolve