--- a/tests/test-evolve-orphan-merge.t Wed May 23 01:11:59 2018 +0530
+++ b/tests/test-evolve-orphan-merge.t Wed Jun 06 04:09:49 2018 +0530
@@ -220,7 +220,7 @@
merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
evolve failed!
- fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort
+ see `hg help evolve.interrupted-evolve`
abort: unresolved merge conflicts (see hg help resolve)
[255]
@@ -277,7 +277,7 @@
merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
evolve failed!
- fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort
+ see `hg help evolve.interrupted-evolve`
abort: unresolved merge conflicts (see hg help resolve)
[255]