diff -r 5b0bd82ea914 -r ed3f69fb67bf tests/test-stabilize-result.t
--- a/tests/test-stabilize-result.t	Sun Apr 29 18:51:56 2018 +0530
+++ b/tests/test-stabilize-result.t	Sun Apr 29 19:04:18 2018 +0530
@@ -393,15 +393,7 @@
   merging a
   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 abort
-  abort: merge conflict between several amendments (this is not automated yet)
-  (/!\ You can try:
-  /!\ * manual merge + resolve => new cset X
-  /!\ * hg up to the parent of the amended changeset (which are named W and Z)
-  /!\ * hg revert --all -r X
-  /!\ * hg ci -m "same message as the amended changeset" => new cset Y
-  /!\ * hg prune -n Y W Z
-  )
+  abort: fix conflicts and run 'hg evolve --continue' or use 'hg update -C .' to abort
   [255]
 
   $ cat > a <<EOF