tests/test-simplemerge.py.out
author Matt Mackall <mpm@selenic.com>
Sat, 19 Jul 2014 00:10:22 -0500
branchstable
changeset 21926 6c36dc6cd61a
parent 4363 2e3c54fb79a3
child 22023 f18830651811
permissions -rw-r--r--
merge default into stable for 3.1 code freeze

....................
----------------------------------------------------------------------
Ran 20 tests in 0.000s

OK