changeset 38291 | a8e7ea176437 |
parent 38288 | fa4a286410a5 |
child 38292 | 2ec44160165d |
--- a/mercurial/commands.py Mon Jun 11 10:09:35 2018 -0700 +++ b/mercurial/commands.py Tue Jun 12 02:36:34 2018 +0530 @@ -2161,10 +2161,7 @@ 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, except - for --force, --user and --date. + The -c/--continue option reapplies all the earlier options. .. container:: verbose