view tests/test-simplemerge.py.out @ 6346:8e3b651382f5

improved semantics for remove (issue438) - Added files are never deleted (only removed with --force). - Modified files can only be removed with --force. - With --after, only deleted files are removed. - With --after --force, all files are removed but not deleted.
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Sat, 22 Mar 2008 10:07:49 +0100
parents 2e3c54fb79a3
children f18830651811
line wrap: on
line source

....................
----------------------------------------------------------------------
Ran 20 tests in 0.000s

OK