diff -r b8b4ff86feb8 -r ededd22e7c7b tests/test-stabilize-conflict.t
--- a/tests/test-stabilize-conflict.t	Wed May 23 01:11:59 2018 +0530
+++ b/tests/test-stabilize-conflict.t	Wed Jun 06 04:09:49 2018 +0530
@@ -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 evolve --abort' to abort
+  see `hg help evolve.interrupted-evolve`
   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 evolve --abort' to abort
+  see `hg help evolve.interrupted-evolve`
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
   $ hg resolve -l