tests/test-simplemerge.py.out

dispatch: move initialization of sys.std* files

I'll add another Python 3 hack.

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

OK