tests/test-simplemerge.py.out
author Matt Mackall <mpm@selenic.com>
Tue, 01 Feb 2011 17:29:38 -0600
branchstable
changeset 13334 2b2155623ee2
parent 4363 2e3c54fb79a3
child 22023 f18830651811
permissions -rw-r--r--
merge with crew

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

OK