diff -r c912eaf29eec -r a0c39e8d2c29 tests/test-evolve-orphan-merge.t
--- a/tests/test-evolve-orphan-merge.t	Fri Mar 23 09:08:21 2018 -0700
+++ b/tests/test-evolve-orphan-merge.t	Mon Apr 23 11:04:27 2018 +0200
@@ -220,7 +220,7 @@
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   evolve failed!
-  fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort
+  fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
 
@@ -277,7 +277,7 @@
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   evolve failed!
-  fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort
+  fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort
   abort: unresolved merge conflicts (see hg help resolve)
   [255]