changeset 38232:ad50f0399e1e

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
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Sat, 02 Jun 2018 15:55:28 +0530
parents 51e420a7a41a
children ee1f052b45ef
files mercurial/commands.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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