tests/test-simplemerge.py.out
author Augie Fackler <augie@google.com>
Tue, 07 Nov 2017 11:22:24 -0500
branchstable
changeset 34990 cabc840ffdee
parent 22023 f18830651811
permissions -rw-r--r--
stable: merge with security patches

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

OK