Mercurial > evolve

diff tests/test-stabilize-result.t @ 3842:b293cce4ff55

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: point to `hg help evolve.interrupted` while resolving content-div Recent test additions shows that --abort and --stop works well while resolving content-divergence and we should advertise them. This patch does so by pointing to evolve.interrupted help topic.
author Pulkit Goyal <7895pulkit@gmail.com>
date Tue, 12 Jun 2018 04:01:19 +0530
parents f67ac33c07d2
children f0096db2a7b1
line wrap: on
line diff
--- a/tests/test-stabilize-result.t	Tue Jun 12 03:29:13 2018 +0530
+++ b/tests/test-stabilize-result.t	Tue Jun 12 04:01:19 2018 +0530
@@ -394,7 +394,7 @@
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-  abort: fix conflicts and run 'hg evolve --continue' or use 'hg update -C .' to abort
+  abort: fix conflicts and see `hg help evolve.interrupted`
   [255]
 
   $ cat > a <<EOF