--- a/tests/test-evolve.t	Thu Apr 19 16:27:13 2018 +0200
+++ b/tests/test-evolve.t	Sun Apr 22 11:40:17 2018 +0200
@@ -1536,7 +1536,7 @@
   merging newfile
   warning: conflicts while merging newfile! (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]