tests/test-simplemerge.py.out
author Martin Geisler <martin@geisler.net>
Thu, 19 Jul 2012 00:54:33 +0200
changeset 17223 c315842cb25f
parent 4363 2e3c54fb79a3
child 22023 f18830651811
permissions -rw-r--r--
merge with stable

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

OK