tests/test-simplemerge.py.out
author Matt Mackall <mpm@selenic.com>
Tue, 11 May 2010 17:11:40 -0500
branchstable
changeset 11160 fdcf80f26604
parent 4363 2e3c54fb79a3
child 22023 f18830651811
permissions -rw-r--r--
Merge with i18n

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

OK