equal
deleted
inserted
replaced
2505 |
2505 |
2506 Changesets that are ancestors of the current revision, that have |
2506 Changesets that are ancestors of the current revision, that have |
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. |
2516 |
2516 |
2517 .. container:: verbose |
2517 .. container:: verbose |