Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
graft: correct documentation about options can be reapplied
authorSushil khanchi <sushilkhanchi97@gmail.com>
Sat, 02 Jun 2018 15:55:28 +0530
changeset 38220 ad50f0399e1e
parent 38219 51e420a7a41a
child 38221 ee1f052b45ef
graft: correct documentation about options can be reapplied Now options --user and --date can be reapplied after we hit a conflict. Differential Revision: https://phab.mercurial-scm.org/D3678
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- a/mercurial/commands.py	Sat Jun 02 22:18:12 2018 -0400
+++ b/mercurial/commands.py	Sat Jun 02 15:55:28 2018 +0530
@@ -2164,7 +2164,7 @@
     .. note::
 
        The -c/--continue option does not reapply earlier options, except
-       for --force.
+       for --force, --user and --date.
 
     .. container:: verbose
mercurial