view tests/test-simplemerge.py.out @ 6795:c228ae4bc89c

merge the backout head
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Wed, 02 Jul 2008 11:31:19 +0200
parents 2e3c54fb79a3
children f18830651811
line wrap: on
line source

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

OK