tests/test-simplemerge.py.out
author Matt Mackall <mpm@selenic.com>
Wed, 30 Nov 2011 17:15:39 -0600
changeset 15591 97fc5eec3f43
parent 4363 2e3c54fb79a3
child 22023 f18830651811
permissions -rw-r--r--
merge with stable

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

OK