changeset 39707 | 5abc47d4ca6b |
parent 38965 | cf68e2649e0a |
child 39736 | e7ae31199ff9 |
--- a/tests/test-conflict.t Tue Sep 18 22:40:03 2018 -0400 +++ b/tests/test-conflict.t Tue Sep 18 23:47:21 2018 -0400 @@ -137,7 +137,7 @@ Verify line trimming of custom conflict marker using multi-byte characters $ hg up -q --clean . - $ $PYTHON <<EOF + $ "$PYTHON" <<EOF > fp = open('logfile', 'wb') > fp.write(b'12345678901234567890123456789012345678901234567890' + > b'1234567890') # there are 5 more columns for 80 columns