tests/test-simplemerge.py.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Sun, 28 Dec 2008 20:21:20 +0100
changeset 7545 55e997c8bf62
parent 4363 2e3c54fb79a3
child 22023 f18830651811
permissions -rw-r--r--
merge with -stable

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

OK