# HG changeset patch # User Kevin Bullock # Date 2011-12-20 20:11:14 # 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 --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -2476,9 +2476,9 @@ def graft(ui, repo, *revs, **opts): 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.