Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
authorMatt Mackall <mpm@selenic.com>
Thu, 22 Dec 2011 15:56:27 -0600
changeset 15717 9cf1620e1e75
parent 15716 049643a31b9a (current diff)
parent 15701 32a6e00e4cfe (diff)
child 15718 c604a3d1969d
child 15729 ad913b187621
merge with stable
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- 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.
mercurial