--- 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.