view tests/test-simplemerge.py.out @ 23509:32e68271a037

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 09 Dec 2014 13:32:19 -0600
parents f18830651811
children
line wrap: on
line source

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

OK