Mercurial > evolve

diff tests/test-stabilize-result.t @ 3821:f67ac33c07d2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: rename help topic evolve.interrupted-evolve to evolve.interrupted `evolve.interrupted-evolve` has the word evolve twice. Now that this help topic is a part of evolve command, evolve.interrupted will mean the interrupted evolve command only.
author Pulkit Goyal <7895pulkit@gmail.com>
date Mon, 11 Jun 2018 01:12:12 +0530
parents ededd22e7c7b
children b293cce4ff55
line wrap: on
line diff
--- a/tests/test-stabilize-result.t	Thu Jun 07 22:59:39 2018 +0530
+++ b/tests/test-stabilize-result.t	Mon Jun 11 01:12:12 2018 +0530
@@ -82,7 +82,7 @@
   merging a
   warning: conflicts while merging a! (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 revert -r "orphan()" a