# HG changeset patch
# User Pulkit Goyal <7895pulkit@gmail.com>
# Date 1529008659 -19800
# Node ID 47f5454a30ed7d53a61527370c6f1a0858beed90
# Parent  2049a21c8396b444b03a22b8d78a90ed4001cd6d
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

diff -r 2049a21c8396 -r 47f5454a30ed mercurial/cmdutil.py
--- 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"))
     ]
diff -r 2049a21c8396 -r 47f5454a30ed tests/test-graft.t
--- a/tests/test-graft.t	Thu Jun 14 16:51:39 2018 -0400
+++ b/tests/test-graft.t	Fri Jun 15 02:07:39 2018 +0530
@@ -244,7 +244,7 @@
 
   $ hg ci -m 'commit interrupted graft'
   abort: graft in progress
-  (use 'hg graft --continue' or 'hg graft --stop' to abort)
+  (use 'hg graft --continue' or 'hg graft --stop' to stop)
   [255]
 
 Abort the graft and try committing: