--- a/tests/test-evolve-orphan-merge.t Thu Jun 07 22:59:39 2018 +0530
+++ b/tests/test-evolve-orphan-merge.t Mon Jun 11 01:12:12 2018 +0530
@@ -220,7 +220,7 @@
merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
evolve failed!
- see `hg help evolve.interrupted-evolve`
+ see `hg help evolve.interrupted`
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!
- see `hg help evolve.interrupted-evolve`
+ see `hg help evolve.interrupted`
abort: unresolved merge conflicts (see hg help resolve)
[255]