tests/test-simplemerge.py.out
author Matt Mackall <mpm@selenic.com>
Thu, 15 Dec 2011 14:24:38 -0600
changeset 15644 43bb9c5ab963
parent 4363 2e3c54fb79a3
child 22023 f18830651811
permissions -rw-r--r--
merge with crew

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

OK