view tests/test-simplemerge.py.out @ 25302:bcb17d7dbec2

merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 27 May 2015 17:41:42 -0500
parents f18830651811
children
line wrap: on
line source

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

OK