view tests/test-simplemerge.py.out @ 12549:7b51cce70a37

merge stable into default
author Martin Roppelt <m.p.roppelt@web.de>
date Wed, 22 Sep 2010 09:22:42 +0200
parents 2e3c54fb79a3
children f18830651811
line wrap: on
line source

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

OK