Mercurial > evolve

diff tests/test-stabilize-result.t @ 3702:f6979d64b9fb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: point to '--abort' in error message The way to escape and evolve run has been updated and we need to tell our user about it.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sun, 22 Apr 2018 11:40:17 +0200
parents 92a2d3217de9
children 19ec729f3ca2 5b0bd82ea914
line wrap: on
line diff
--- a/tests/test-stabilize-result.t	Thu Apr 19 16:27:13 2018 +0200
+++ b/tests/test-stabilize-result.t	Sun Apr 22 11:40:17 2018 +0200
@@ -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 update -C .' to abort
+  fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
   $ hg revert -r "orphan()" a