view tests/test-simplemerge.py.out @ 35996:de0666564bde

merge with stable
author Yuya Nishihara <yuya@tcha.org>
date Sat, 10 Feb 2018 21:14:41 +0900
parents f18830651811
children
line wrap: on
line source

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

OK