Mercurial > hg
comparison mercurial/diffhelper.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 | 86e7a57449fa |
children | e7aa113b14f7 |
comparison
equal
deleted
inserted
replaced
38219:51e420a7a41a | 38220:ad50f0399e1e |
---|