tests/test-simplemerge.py.out
author Matt Mackall <mpm@selenic.com>
Sat, 01 Feb 2014 14:53:52 -0600
branchstable
changeset 20341 3cec5134e9c4
parent 4363 2e3c54fb79a3
child 22023 f18830651811
permissions -rw-r--r--
merge with i18n

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

OK