tests/test-simplemerge.py.out
author Patrick Mezard <pmezard@gmail.com>
Sun, 06 Mar 2011 15:30:39 +0100
changeset 13542 6e3bf361f70c
parent 4363 2e3c54fb79a3
child 22023 f18830651811
permissions -rw-r--r--
Merge with stable

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

OK