view tests/test-simplemerge.py.out @ 28286:c7f89ad87bae

merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 29 Feb 2016 17:52:17 -0600
parents f18830651811
children
line wrap: on
line source

................
----------------------------------------------------------------------
Ran 16 tests in 0.000s

OK