diff mercurial/wireprotov1server.py @ 38220: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 aac4be30e250
children 7e4a856a4f05
line wrap: on
line diff