tests/test-simplemerge.py.out
author Matt Mackall <mpm@selenic.com>
Thu, 26 Jul 2007 11:19:53 -0500
changeset 4999 60c54154ec4c
parent 4359 2e3c54fb79a3
permissions -rw-r--r--
merge: don't forget to update the dirstate for exec bit changes

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

OK