changeset 36031 | acda1977210c |
parent 34661 | eb586ed5d8ce |
child 37407 | 567bddcb4271 |
--- a/tests/test-contrib.t Sun Feb 11 17:14:00 2018 +0530 +++ b/tests/test-contrib.t Sun Feb 11 17:19:07 2018 +0530 @@ -201,7 +201,7 @@ binary file - $ $PYTHON -c "f = file('binary-local', 'w'); f.write('\x00'); f.close()" + $ $PYTHON -c "f = open('binary-local', 'w'); f.write('\x00'); f.close()" $ cat orig >> binary-local $ $PYTHON simplemerge -p binary-local base other warning: binary-local looks like a binary file.