equal
deleted
inserted
replaced
2159 If a graft merge results in conflicts, the graft process is |
2159 If a graft merge results in conflicts, the graft process is |
2160 interrupted so that the current merge can be manually resolved. |
2160 interrupted so that the current merge can be manually resolved. |
2161 Once all conflicts are addressed, the graft process can be |
2161 Once all conflicts are addressed, the graft process can be |
2162 continued with the -c/--continue option. |
2162 continued with the -c/--continue option. |
2163 |
2163 |
2164 .. note:: |
2164 The -c/--continue option reapplies all the earlier options. |
2165 |
|
2166 The -c/--continue option does not reapply earlier options, except |
|
2167 for --force, --user and --date. |
|
2168 |
2165 |
2169 .. container:: verbose |
2166 .. container:: verbose |
2170 |
2167 |
2171 Examples: |
2168 Examples: |
2172 |
2169 |