view tests/test-simplemerge.py.out @ 22165:3ddfb9b3fdc6

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 14 Aug 2014 15:21:48 -0500
parents f18830651811
children
line wrap: on
line source

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

OK