Mercurial > hg

diff mercurial/cmdutil.py @ 38311:47f5454a30ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cmdutil: say that `graft --stop` stops the graft instead of aborting I am going to add a --abort flag to graft soon, so we make sure we differentiate between the what --stop flag does and what --abort does and don't use the words interchangeably. Differential Revision: https://phab.mercurial-scm.org/D3735
author Pulkit Goyal <7895pulkit@gmail.com>
date Fri, 15 Jun 2018 02:07:39 +0530
parents 2ec44160165d
children 50f5fc232c16
line wrap: on
line diff
--- a/mercurial/cmdutil.py	Thu Jun 14 16:51:39 2018 -0400
+++ b/mercurial/cmdutil.py	Fri Jun 15 02:07:39 2018 +0530
@@ -3173,7 +3173,7 @@
 # (state file, clearable, allowcommit, error, hint)
 unfinishedstates = [
     ('graftstate', True, False, _('graft in progress'),
-     _("use 'hg graft --continue' or 'hg graft --stop' to abort")),
+     _("use 'hg graft --continue' or 'hg graft --stop' to stop")),
     ('updatestate', True, False, _('last update was interrupted'),
      _("use 'hg update' to get a consistent checkout"))
     ]