tests/test-simplemerge.py.out

trydiff: replace dodiff=True/'binary' by binarydiff=False/True

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

OK