view tests/test-simplemerge.py.out @ 15630:e6868bd17f24

merge with stable
author Martin Geisler <mg@aragost.com>
date Fri, 09 Dec 2011 17:58:12 +0100
parents 2e3c54fb79a3
children f18830651811
line wrap: on
line source

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

OK