view tests/test-simplemerge.py.out @ 36690:b529e640015d

merge with stable
author Augie Fackler <augie@google.com>
date Sun, 04 Mar 2018 10:42:51 -0500
parents f18830651811
children
line wrap: on
line source

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

OK