tests/test-simplemerge.py.out
author Patrick Mezard <pmezard@gmail.com>
Sat, 22 Jan 2011 16:29:10 +0100
changeset 13288 9c3bfba3f48d
parent 4363 2e3c54fb79a3
child 22023 f18830651811
permissions -rw-r--r--
Merge with stable

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

OK