view tests/test-simplemerge.py.out @ 41529:13a6dd952ffe

merge with stable
author Pulkit Goyal <pulkit@yandex-team.ru>
date Mon, 04 Feb 2019 20:35:21 +0300
parents f18830651811
children
line wrap: on
line source

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

OK