diff -r f87641bf4d23 -r 80e5210df25c tests/test-conflict.t --- a/tests/test-conflict.t Wed Feb 07 13:47:03 2018 +0530 +++ b/tests/test-conflict.t Wed Feb 07 13:49:02 2018 +0530 @@ -138,7 +138,7 @@ $ hg up -q --clean . $ $PYTHON < fp = open('logfile', 'w') + > fp = open('logfile', 'wb') > fp.write(b'12345678901234567890123456789012345678901234567890' + > b'1234567890') # there are 5 more columns for 80 columns >