--- a/tests/test-evolve.t	Fri Jun 07 02:25:02 2019 +0200
+++ b/tests/test-evolve.t	Thu Jun 06 17:37:42 2019 +0800
@@ -1389,7 +1389,8 @@
   move:[31] will cause conflict at evolve
   merging newfile
   warning: conflicts while merging newfile! (edit, then use 'hg resolve --mark')
-  fix conflicts and see `hg help evolve.interrupted`
+  unresolved merge conflicts
+  (see 'hg help evolve.interrupted')
   [1]
 
   $ glog -r "desc('add unstableifparentisfolded')::" --hidden