diff -r daab6d665687 -r b6c819facbe8 tests/test-evolve-stop-orphan.t
--- a/tests/test-evolve-stop-orphan.t	Fri Jun 07 02:25:02 2019 +0200
+++ b/tests/test-evolve-stop-orphan.t	Thu Jun 06 17:37:42 2019 +0800
@@ -90,7 +90,8 @@
   atop:[5] added c
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
-  fix conflicts and see `hg help evolve.interrupted`
+  unresolved merge conflicts
+  (see 'hg help evolve.interrupted')
   [1]
 
   $ hg evolve --stop
@@ -135,7 +136,8 @@
   atop:[5] added c
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
-  fix conflicts and see `hg help evolve.interrupted`
+  unresolved merge conflicts
+  (see 'hg help evolve.interrupted')
   [1]
 
   $ hg diff
@@ -196,7 +198,8 @@
   atop:[5] added c
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
-  fix conflicts and see `hg help evolve.interrupted`
+  unresolved merge conflicts
+  (see 'hg help evolve.interrupted')
   [1]
   $ echo foo > d
   $ hg resolve -m
@@ -245,7 +248,8 @@
   move:[5] added c
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
-  fix conflicts and see `hg help evolve.interrupted`
+  unresolved merge conflicts
+  (see 'hg help evolve.interrupted')
   [1]
 
   $ hg status
@@ -282,7 +286,8 @@
   atop:[9] added b
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
-  fix conflicts and see `hg help evolve.interrupted`
+  unresolved merge conflicts
+  (see 'hg help evolve.interrupted')
   [1]
 
   $ echo foobar > c
@@ -357,7 +362,8 @@
   move:[10] added c
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
-  fix conflicts and see `hg help evolve.interrupted`
+  unresolved merge conflicts
+  (see 'hg help evolve.interrupted')
   [1]
 
   $ hg evolve --stop