tests/test-merge1.t

--- a/tests/test-merge1.t	Tue Jun 20 17:25:57 2017 -0400
+++ b/tests/test-merge1.t	Tue Jun 20 17:31:18 2017 -0400
@@ -10,7 +10,7 @@
   > 
   > print "merging for", os.path.basename(sys.argv[1])
   > EOF
-  $ HGMERGE="python ../merge"; export HGMERGE
+  $ HGMERGE="$PYTHON ../merge"; export HGMERGE
 
   $ hg init t
   $ cd t