tests/test-simplemerge.py.out
author Matt Mackall <mpm@selenic.com>
Fri, 21 Sep 2007 17:25:25 -0500
changeset 5324 7b4b874ce12c
parent 4359 2e3c54fb79a3
permissions -rw-r--r--
convert-cvs: update test to pass on Linux

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

OK