tests/test-simplemerge.py.out
author Matt Mackall <mpm@selenic.com>
Thu, 16 Apr 2015 20:57:51 -0500
branchstable
changeset 24803 e89f909edffa
parent 22023 f18830651811
permissions -rw-r--r--
merge default into stable for 3.4 freeze

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

OK