tests/test-simplemerge.py.out
author Kevin Bullock <kbullock+mercurial@ringworld.org>
Tue, 01 Nov 2016 13:03:42 -0500
branchstable
changeset 30249 eab274469952
parent 22023 f18830651811
permissions -rw-r--r--
merge with i18n

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

OK