view tests/test-simplemerge.py.out @ 18569:11bcab177d22

merge with stable
author Kevin Bullock <kbullock@ringworld.org>
date Fri, 08 Feb 2013 14:26:00 +0000
parents 2e3c54fb79a3
children f18830651811
line wrap: on
line source

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

OK