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

(binary:application/octet-stream)