--- a/tests/test-stabilize-conflict.t Thu Jun 07 22:59:39 2018 +0530
+++ b/tests/test-stabilize-conflict.t Mon Jun 11 01:12:12 2018 +0530
@@ -129,7 +129,7 @@
merging babar
warning: conflicts while merging babar! (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]
$ hg resolve -l
@@ -223,7 +223,7 @@
was merge successful (yn)? n
merging babar failed!
evolve failed!
- see `hg help evolve.interrupted-evolve`
+ see `hg help evolve.interrupted`
abort: unresolved merge conflicts (see hg help resolve)
[255]
$ hg resolve -l