view tests/test-simplemerge.py.out @ 14478:f31e250c4380

merge with stable
author Martin Geisler <mg@lazybytes.net>
date Mon, 30 May 2011 12:21:53 +0200
parents 2e3c54fb79a3
children f18830651811
line wrap: on
line source

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

OK