view tests/test-simplemerge.py.out @ 13040:44b26a87f73e

Merge with stable
author Steve Borho <steve@borho.org>
date Wed, 24 Nov 2010 13:43:40 -0600
parents 2e3c54fb79a3
children f18830651811
line wrap: on
line source

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

OK