tests/test-simplemerge.py.out
author Matt Mackall <mpm@selenic.com>
Tue, 08 May 2007 11:42:48 -0500
changeset 4417 0912d8df5e19
parent 4359 2e3c54fb79a3
permissions -rw-r--r--
Merge with stable

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

OK