view tests/test-simplemerge.py.out @ 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 f18830651811
children
line wrap: on
line source

................
----------------------------------------------------------------------
Ran 16 tests in 0.000s

OK