tests/test-simplemerge.py.out
author Matt Mackall <mpm@selenic.com>
Thu, 05 Jul 2007 16:15:57 -0500
changeset 4821 8706e75e6431
parent 4359 2e3c54fb79a3
permissions -rw-r--r--
Merge with crew-stable

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

OK