tests/test-simplemerge.py.out
author Kevin Bullock <kbullock+mercurial@ringworld.org>
Tue, 02 May 2017 17:29:01 -0500
changeset 32164 6cacc271ee0a
parent 22023 f18830651811
permissions -rw-r--r--
merge stable into default

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

OK