view tests/test-simplemerge.py.out @ 14885:50b67d5c4073

merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 15 Jul 2011 14:27:16 -0500
parents 2e3c54fb79a3
children f18830651811
line wrap: on
line source

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

OK