tests/test-simplemerge.py.out
author Martin Geisler <mg@lazybytes.net>
Thu, 02 Sep 2010 17:28:20 +0200
changeset 12152 e59156a1316f
parent 4363 2e3c54fb79a3
child 22023 f18830651811
permissions -rw-r--r--
merge with stable

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

OK