# HG changeset patch
# User Kevin Bullock <kbullock@ringworld.org>
# Date 1324411874 21600
# Node ID 32a6e00e4cfe84573b9d4dc71155d0dc23b75faf
# Parent  84e55467093c1cdf2d2026a465808849ec39249d
graft: use consistent language in help

Removes the word 'aborted' from the 3rd paragraph in favor of
'interrupted', the same word used in the description of the
-c/--continue switch. The word 'interrupted' is also consistent with
the help for rebase.

diff -r 84e55467093c -r 32a6e00e4cfe mercurial/commands.py
--- a/mercurial/commands.py	Tue Dec 20 11:43:38 2011 -0600
+++ b/mercurial/commands.py	Tue Dec 20 14:11:14 2011 -0600
@@ -2476,9 +2476,9 @@
     already been grafted, or that are merges will be skipped.
 
     If a graft merge results in conflicts, the graft process is
-    aborted so that the current merge can be manually resolved. Once
-    all conflicts are addressed, the graft process can be continued
-    with the -c/--continue option.
+    interrupted so that the current merge can be manually resolved.
+    Once all conflicts are addressed, the graft process can be
+    continued with the -c/--continue option.
 
     .. note::
       The -c/--continue option does not reapply earlier options.