changeset 22947 | c63a09b6b337 |
parent 22024 | 372ae2745acf |
child 26614 | ef1eb6df7071 |
--- a/tests/test-contrib.t Wed Oct 15 15:13:43 2014 -0400 +++ b/tests/test-contrib.t Wed Oct 15 15:35:59 2014 -0400 @@ -207,7 +207,7 @@ binary file - $ python -c "f = file('binary-local', 'w'); f.write('\x00'); f.close()" + $ $PYTHON -c "f = file('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.