tests/test-simplemerge.py.out
author Martin Geisler <mg@aragost.com>
Mon, 14 Mar 2011 14:05:19 +0100
changeset 13637 4e976235c985
parent 4363 2e3c54fb79a3
child 22023 f18830651811
permissions -rw-r--r--
merge with stable

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

OK