view tests/test-simplemerge.py.out @ 28902:eb017d52899d

remove: fix --force option help description (issue5177) Before this commit --force option help description stated that file was removed and deleted even if file was added or modified which is not true. Force option removes added file only from dirstate, it doesn't delete it from the filesystem.
author liscju <piotr.listkiewicz@gmail.com>
date Wed, 13 Apr 2016 09:56:51 +0200
parents f18830651811
children
line wrap: on
line source

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

OK