# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1324590987 21600
# Node ID 9cf1620e1e75fc85f4b30cab7b3a0117c1ed44d1
# Parent  049643a31b9af9eda76b4fb83075668b34065a37# Parent  32a6e00e4cfe84573b9d4dc71155d0dc23b75faf
merge with stable

diff -r 049643a31b9a -r 9cf1620e1e75 mercurial/commands.py
--- a/mercurial/commands.py	Thu Dec 22 15:56:17 2011 -0600
+++ b/mercurial/commands.py	Thu Dec 22 15:56:27 2011 -0600
@@ -2507,9 +2507,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.