tests/test-simplemerge.py.out
author Augie Fackler <augie@google.com>
Fri, 23 Jun 2017 15:30:27 -0400
changeset 33020 c808862f2e6e
parent 22023 f18830651811
permissions -rw-r--r--
merge with stable

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

OK