view tests/test-simplemerge.py.out @ 13329:4e92ad05fe18

merge with stable
author Mads Kiilerich <mads@kiilerich.com>
date Tue, 01 Feb 2011 01:55:45 +0100
parents 2e3c54fb79a3
children f18830651811
line wrap: on
line source

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

OK