view tests/test-simplemerge.py.out @ 38305:1445b556e9d2

merge with stable
author Yuya Nishihara <yuya@tcha.org>
date Thu, 14 Jun 2018 20:09:54 +0900
parents f18830651811
children
line wrap: on
line source

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

OK