tests/test-stabilize-result.t
changeset 3796 ededd22e7c7b
parent 3787 dc81a788f278
child 3821 f67ac33c07d2
--- a/tests/test-stabilize-result.t	Wed May 23 01:11:59 2018 +0530
+++ b/tests/test-stabilize-result.t	Wed Jun 06 04:09:49 2018 +0530
@@ -82,7 +82,7 @@
   merging a
   warning: conflicts while merging a! (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]
   $ hg revert -r "orphan()" a