diff -r c912eaf29eec -r a0c39e8d2c29 tests/test-stabilize-conflict.t
--- a/tests/test-stabilize-conflict.t	Fri Mar 23 09:08:21 2018 -0700
+++ b/tests/test-stabilize-conflict.t	Mon Apr 23 11:04:27 2018 +0200
@@ -129,7 +129,7 @@
   merging babar
   warning: conflicts while merging babar! (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]
   $ hg resolve -l
@@ -223,7 +223,7 @@
   was merge successful (yn)? n
   merging babar failed!
   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]
   $ hg resolve -l