diff -r daab6d665687 -r b6c819facbe8 tests/test-evolve-progress.t
--- a/tests/test-evolve-progress.t	Fri Jun 07 02:25:02 2019 +0200
+++ b/tests/test-evolve-progress.t	Thu Jun 06 17:37:42 2019 +0800
@@ -135,7 +135,8 @@
   picked tool ':merge' for a (binary False symlink False changedelete False)
   my a@f8d7d38c0a88+ other a@df5d742141b0 ancestor a@152c368c622b
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
-  fix conflicts and see `hg help evolve.interrupted`
+  unresolved merge conflicts
+  (see 'hg help evolve.interrupted')
   [1]
   $ echo resolved > a
   $ hg resolve -m a