tests/test-simplemerge.py.out
author Matt Mackall <mpm@selenic.com>
Thu, 12 Apr 2012 20:52:39 -0500
changeset 16415 a232a1b5ae9b
parent 4363 2e3c54fb79a3
child 22023 f18830651811
permissions -rw-r--r--
merge with stable

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

OK