--- a/tests/test-issue-5720.t	Tue Jun 12 04:01:19 2018 +0530
+++ b/tests/test-issue-5720.t	Tue Jun 12 19:00:12 2018 +0530
@@ -61,9 +61,7 @@
   atop:[3] b
   merging a
   warning: conflicts while merging a! (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]
 
 Fix the conflict