Mercurial > evolve

diff tests/test-evolve.t @ 3796:ededd22e7c7b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: show `hg help evolve.interrupted-evolve` in error when conflicts The help list various flags which you can use during interrupted evolve resolution and description about what they do. This will be very helpful for user on how to continue an interrupted evolve.
author Pulkit Goyal <7895pulkit@gmail.com>
date Wed, 06 Jun 2018 04:09:49 +0530
parents 1e103c7f7663
children f67ac33c07d2
line wrap: on
line diff
--- a/tests/test-evolve.t	Wed May 23 01:11:59 2018 +0530
+++ b/tests/test-evolve.t	Wed Jun 06 04:09:49 2018 +0530
@@ -1536,7 +1536,7 @@
   merging newfile
   warning: conflicts while merging newfile! (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]