--- a/tests/test-evolve-phase-divergence.t	Thu Apr 19 16:27:13 2018 +0200
+++ b/tests/test-evolve-phase-divergence.t	Sun Apr 22 11:40:17 2018 +0200
@@ -788,7 +788,7 @@
   merging x
   warning: conflicts while merging x! (edit, then use 'hg resolve --mark')
   evolution failed!
-  fix conflict and run 'hg evolve --continue'
+  fix conflict then run 'hg evolve --continue' or use `hg evolve --abort`
   abort: unresolved merge conflicts (see hg help resolve)
   [255]