[PATCH STABLE] graft: use consistent language in help

[Kevin Bullock]

# HG changeset patch
# User Kevin Bullock <kbullock at ringworld.org>
# Date 1324411874 21600
# Branch stable
# Node ID 7351afd5b2229b08728d0911c8cefa4cae7ff714
# Parent  7722593fef5c54b778f0483f93743ee91db7d340
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 --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -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.