--- a/tests/test-stabilize-conflict.t	Tue Jun 12 04:01:19 2018 +0530
+++ b/tests/test-stabilize-conflict.t	Tue Jun 12 19:00:12 2018 +0530
@@ -128,9 +128,7 @@
   atop:[5] babar count up to ten
   merging babar
   warning: conflicts while merging babar! (edit, then use 'hg resolve --mark')
-  evolve failed!
-  see `hg help evolve.interrupted`
-  abort: unresolved merge conflicts (see hg help resolve)
+  abort: fix conflicts and see `hg help evolve.interrupted`
   [255]
   $ hg resolve -l
   U babar
@@ -222,9 +220,7 @@
    output file babar appears unchanged
   was merge successful (yn)? n
   merging babar failed!
-  evolve failed!
-  see `hg help evolve.interrupted`
-  abort: unresolved merge conflicts (see hg help resolve)
+  abort: fix conflicts and see `hg help evolve.interrupted`
   [255]
   $ hg resolve -l
   U babar