--- a/tests/test-evolve.t	Wed Feb 01 15:45:20 2017 +0100
+++ b/tests/test-evolve.t	Wed Feb 01 15:51:02 2017 +0100
@@ -593,7 +593,8 @@
   $ hg graft -O 7
   grafting 7:a5bfd90a2f29 "conflict" (tip)
   merging 1
-  warning: conflicts while merging 1! (edit, then use 'hg resolve --mark')
+  warning: conflicts during merge.
+  merging 1 incomplete! (edit conflicts, then use 'hg resolve --mark')
   abort: unresolved conflicts, can't continue
   (use hg resolve and hg graft --continue)
   [255]
@@ -1442,7 +1443,8 @@
   move:[39] will cause conflict at evolve
   atop:[42] will be evolved safely
   merging newfile
-  warning: conflicts while merging newfile! (edit, then use 'hg resolve --mark')
+  warning: conflicts during merge.
+  merging newfile 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)

--- a/tests/test-split.t	Wed Feb 01 15:45:20 2017 +0100
+++ b/tests/test-split.t	Wed Feb 01 15:51:02 2017 +0100
@@ -336,6 +336,7 @@
   > evolution=createmarkers
   > evolutioncommands=split
   > EOF
+  $ hg up -qC tip
   $ hg split -r "desc(split3)"
   abort: cannot split commit: ced8fbcce3a7 not a head
   [255]
@@ -345,6 +346,7 @@
   $ echo "evolution=createmarkers" >> $HGRCPATH
 
 Running split without any revision operates on the parent of the working copy
+  $ hg up -qC tip
   $ hg split << EOF
   > q
   > EOF
@@ -358,6 +360,7 @@
   [255]
 
 Running split with tip revision, specified as unnamed argument
+  $ hg up -qC tip
   $ hg split . << EOF
   > q
   > EOF
@@ -377,6 +380,8 @@
   abort: more than one revset is given
   (use either `hg split <rs>` or `hg split --rev <rs>`, not both)
   [255]
+  $ hg revert --all
+  forgetting _d
 
 Split empty commit (issue5191)
   $ hg branch new-branch

--- 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)

--- a/tests/test-stabilize-result.t	Wed Feb 01 15:45:20 2017 +0100
+++ b/tests/test-stabilize-result.t	Wed Feb 01 15:51:02 2017 +0100
@@ -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 abort
   abort: merge conflict between several amendments (this is not automated yet)

--- a/tests/test-touch.t	Wed Feb 01 15:45:20 2017 +0100
+++ b/tests/test-touch.t	Wed Feb 01 15:51:02 2017 +0100
@@ -43,7 +43,7 @@
   $ hg touch .
   [1] a
   reviving this changeset will create divergence unless you make a duplicate.
-  (a)llow divergence or (d)uplicate the changeset?  a
+  (a)llow divergence or (d)uplicate the changeset? a
   2 new divergent changesets
   $ hg log -G
   @  4:[0-9a-f]{12} a (re)