tests/test-simplemerge.py.out
author Matt Mackall <mpm@selenic.com>
Tue, 01 Nov 2011 12:49:06 -0500
branchstable
changeset 15397 f32f71f6c20c
parent 4363 2e3c54fb79a3
child 22023 f18830651811
permissions -rw-r--r--
merge with i18n

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

OK