##// END OF EJS Templates
merge with stable
Matt Mackall -
r15717:9cf1620e merge default
parent child Browse files
Show More
@@ -2507,9 +2507,9 b' def graft(ui, repo, *revs, **opts):'
2507 already been grafted, or that are merges will be skipped.
2507 already been grafted, or that are merges will be skipped.
2508
2508
2509 If a graft merge results in conflicts, the graft process is
2509 If a graft merge results in conflicts, the graft process is
2510 aborted so that the current merge can be manually resolved. Once
2510 interrupted so that the current merge can be manually resolved.
2511 all conflicts are addressed, the graft process can be continued
2511 Once all conflicts are addressed, the graft process can be
2512 with the -c/--continue option.
2512 continued with the -c/--continue option.
2513
2513
2514 .. note::
2514 .. note::
2515 The -c/--continue option does not reapply earlier options.
2515 The -c/--continue option does not reapply earlier options.
General Comments 0
You need to be logged in to leave comments. Login now