view tests/test-simplemerge.py.out @ 13059:f553024f1832

merge with stable
author Martin Geisler <mg@lazybytes.net>
date Wed, 01 Dec 2010 11:04:50 +0100
parents 2e3c54fb79a3
children f18830651811
line wrap: on
line source

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

OK