view tests/test-simplemerge.py.out @ 11104:9fa028431957

Merge with stable
author Martin Geisler <mg@lazybytes.net>
date Fri, 07 May 2010 17:03:48 +0200
parents 2e3c54fb79a3
children f18830651811
line wrap: on
line source

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

OK