view tests/test-simplemerge.py.out @ 18583:b27b17a5362a

merge with mpm stable
author Kevin Bullock <kbullock@ringworld.org>
date Sat, 09 Feb 2013 10:36:31 +0000
parents 2e3c54fb79a3
children f18830651811
line wrap: on
line source

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

OK