view tests/test-simplemerge.py.out @ 20368:cc00cd6c51c2

merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 05 Feb 2014 18:09:07 -0600
parents 2e3c54fb79a3
children f18830651811
line wrap: on
line source

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

OK