tests/test-simplemerge.py.out
author Matt Mackall <mpm@selenic.com>
Wed, 01 Aug 2007 14:03:48 -0500
changeset 5046 bf444a9a9c23
parent 4359 2e3c54fb79a3
permissions -rw-r--r--
Merge with stable

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

OK