Mercurial > hg
changeset 15701:32a6e00e4cfe stable
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.
| author | Kevin Bullock <kbullock@ringworld.org> |
|---|---|
| date | Tue, 20 Dec 2011 14:11:14 -0600 |
| parents | 84e55467093c |
| children | 9cf1620e1e75 4751d5133f15 e47ba02ad06b |
| files | mercurial/commands.py |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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.