##// END OF EJS Templates
graft: use consistent language in help...
Kevin Bullock -
r15701:32a6e00e stable
parent child Browse files
Show More
@@ -2476,9 +2476,9 def graft(ui, repo, *revs, **opts):
2476 already been grafted, or that are merges will be skipped.
2476 already been grafted, or that are merges will be skipped.
2477
2477
2478 If a graft merge results in conflicts, the graft process is
2478 If a graft merge results in conflicts, the graft process is
2479 aborted so that the current merge can be manually resolved. Once
2479 interrupted so that the current merge can be manually resolved.
2480 all conflicts are addressed, the graft process can be continued
2480 Once all conflicts are addressed, the graft process can be
2481 with the -c/--continue option.
2481 continued with the -c/--continue option.
2482
2482
2483 .. note::
2483 .. note::
2484 The -c/--continue option does not reapply earlier options.
2484 The -c/--continue option does not reapply earlier options.
General Comments 0
You need to be logged in to leave comments. Login now