tests/test-simplemerge.py.out
author Bryan O'Sullivan <bos@serpentine.com>
Wed, 01 Aug 2007 12:03:10 -0700
changeset 5043 8b1ee1f59b3c
parent 4359 2e3c54fb79a3
permissions -rw-r--r--
dirstate: improve error message on file/directory clash

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

OK