Mercurial > hg
changeset 15717:9cf1620e1e75
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 22 Dec 2011 15:56:27 -0600 |
| parents | 049643a31b9a (current diff) 32a6e00e4cfe (diff) |
| children | c604a3d1969d ad913b187621 |
| files | mercurial/commands.py |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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.