Mercurial > evolve

diff tests/test-stabilize-conflict.t @ 1799:b1809340478b mercurial-3.5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with 5.6.0 no extra changes were needed form the mercurial-3.6 branch.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Wed, 01 Feb 2017 15:51:02 +0100
parents ad04f3c3b1a9 e35667b01e1e
children
line wrap: on
line diff
--- a/tests/test-stabilize-conflict.t	Wed Feb 01 15:45:20 2017 +0100
+++ b/tests/test-stabilize-conflict.t	Wed Feb 01 15:51:02 2017 +0100
@@ -127,7 +127,8 @@
   move:[5] babar count up to fifteen
   atop:[7] babar count up to ten
   merging babar
-  warning: conflicts while merging babar! (edit, then use 'hg resolve --mark')
+  warning: conflicts during merge.
+  merging babar 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)