tests/test-simplemerge.py.out
author Matt Mackall <mpm@selenic.com>
Wed, 21 Jan 2009 14:14:56 -0600
changeset 7676 43cfbb21f04d
parent 4363 2e3c54fb79a3
child 22023 f18830651811
permissions -rw-r--r--
Merge with stable

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

OK