view tests/test-simplemerge.py.out @ 12383:f1e8d6f6e682

merge with stable
author Mads Kiilerich <mads@kiilerich.com>
date Thu, 23 Sep 2010 01:59:02 +0200
parents 2e3c54fb79a3
children f18830651811
line wrap: on
line source

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

OK