view tests/test-simplemerge.py.out @ 13283:a3e834a9e9c4

merge with main
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Thu, 20 Jan 2011 20:35:54 +0100
parents 2e3c54fb79a3
children f18830651811
line wrap: on
line source

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

OK