view tests/test-simplemerge.py.out @ 21992:6be1e1dbe6a0

merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 04 Aug 2014 14:32:34 -0500
parents 2e3c54fb79a3
children f18830651811
line wrap: on
line source

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

OK