Mercurial > evolve

diff tests/test-stabilize-conflict.t @ 1600:0d8973818980 mercurial-3.5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: register expected difference for Mercurial 3.5
author Pierre-Yves David <pierre-yves.david@fb.com>
date Thu, 04 Feb 2016 11:07:44 +0000
parents c4f8a2916e43
children ad04f3c3b1a9
line wrap: on
line diff
--- a/tests/test-stabilize-conflict.t	Thu Feb 04 10:24:26 2016 +0000
+++ b/tests/test-stabilize-conflict.t	Thu Feb 04 11:07:44 2016 +0000
@@ -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)