diff -r daab6d665687 -r b6c819facbe8 tests/test-stabilize-conflict.t
--- a/tests/test-stabilize-conflict.t	Fri Jun 07 02:25:02 2019 +0200
+++ b/tests/test-stabilize-conflict.t	Thu Jun 06 17:37:42 2019 +0800
@@ -128,7 +128,8 @@
   atop:[5] babar count up to ten
   merging babar
   warning: conflicts while merging babar! (edit, then use 'hg resolve --mark')
-  fix conflicts and see `hg help evolve.interrupted`
+  unresolved merge conflicts
+  (see 'hg help evolve.interrupted')
   [1]
   $ hg resolve -l
   U babar
@@ -220,7 +221,8 @@
    output file babar appears unchanged
   was merge successful (yn)? n
   merging babar failed!
-  fix conflicts and see `hg help evolve.interrupted`
+  unresolved merge conflicts
+  (see 'hg help evolve.interrupted')
   [1]
   $ hg resolve -l
   U babar