--- a/tests/test-evolve-phase-divergence.t Tue Jun 12 04:01:19 2018 +0530
+++ b/tests/test-evolve-phase-divergence.t Tue Jun 12 19:00:12 2018 +0530
@@ -792,9 +792,7 @@
rebasing to destination parent: 8c2bb6fb44e9
merging x
warning: conflicts while merging x! (edit, then use 'hg resolve --mark')
- evolution failed!
- fix conflict then run 'hg evolve --continue' or use `hg evolve --abort`
- abort: unresolved merge conflicts (see hg help resolve)
+ abort: fix conflicts and see `hg help evolve.interrupted`
[255]
$ hg diff