tests/test-simplemerge.py.out
author Matt Mackall <mpm@selenic.com>
Mon, 24 Mar 2008 11:12:57 -0500
changeset 6378 f0f830114a9b
parent 4363 2e3c54fb79a3
child 22023 f18830651811
permissions -rw-r--r--
Merge with crew

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

OK