# HG changeset patch
# User Sushil khanchi <sushilkhanchi97@gmail.com>
# Date 1527935128 -19800
# 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 -r 51e420a7a41a -r ad50f0399e1e mercurial/commands.py
--- 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