Mercurial > evolve

diff hgext/evolve.py @ 1755:6c78a5470583 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: prefer "abort" over "abandon" in messages for consistency
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 28 Oct 2016 17:11:43 -0700
parents c9ddc93eee67
children a7dcfff8c4a9
line wrap: on
line diff
--- a/hgext/evolve.py	Fri Oct 28 15:17:27 2016 -0700
+++ b/hgext/evolve.py	Fri Oct 28 17:11:43 2016 -0700
@@ -2148,7 +2148,7 @@
     hg._showstats(repo, stats)
     if stats[3]:
         repo.ui.status(_("use 'hg resolve' to retry unresolved file merges "
-                         "or 'hg update -C .' to abandon\n"))
+                         "or 'hg update -C .' to abort\n"))
     if stats[3] > 0:
         raise error.Abort('merge conflict between several amendments '
             '(this is not automated yet)',