tests/test-simplemerge.py.out

py3: simply use b'%d\n' to format pid in server.py

Spotted by Martin, thanks.

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

OK