tests/test-simplemerge.py.out
author Matt Mackall <mpm@selenic.com>
Sun, 01 Jan 2012 13:37:30 -0600
branchstable
changeset 15758 634404392449
parent 4363 2e3c54fb79a3
child 22023 f18830651811
permissions -rw-r--r--
merge with i18n

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

OK