# HG changeset patch # User Sushil khanchi # Date 2018-06-02 10:25:28 # Node ID ad50f0399e1e04c2ae40e9e326e44b6fff3108f4 # Parent 51e420a7a41a9c4b60d7462463c26c8391b06e51 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 diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -2164,7 +2164,7 @@ def graft(ui, repo, *revs, **opts): .. note:: The -c/--continue option does not reapply earlier options, except - for --force. + for --force, --user and --date. .. container:: verbose