tests/test-conflict.t

--- a/tests/test-conflict.t	Wed Jul 05 11:09:55 2017 -0500
+++ b/tests/test-conflict.t	Wed Jul 05 11:10:11 2017 -0500
@@ -120,7 +120,7 @@
 Verify line trimming of custom conflict marker using multi-byte characters
 
   $ hg up -q --clean .
-  $ python <<EOF
+  $ $PYTHON <<EOF
   > fp = open('logfile', 'w')
   > fp.write('12345678901234567890123456789012345678901234567890' +
   >          '1234567890') # there are 5 more columns for 80 columns