D3678: graft: correct documentation about options can be reapplied
khanchi97 (Sushil khanchi)
phabricator at mercurial-scm.org
Sat Jun 2 17:21:43 UTC 2018
khanchi97 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Now options --user and --date can be reapplied after we hit a conflict.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3678
AFFECTED FILES
mercurial/commands.py
CHANGE DETAILS
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -2164,7 +2164,7 @@
.. note::
The -c/--continue option does not reapply earlier options, except
- for --force.
+ for --force, --user and --date.
.. container:: verbose
To: khanchi97, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list