changeset 33286 | 2428e8ec0793 |
parent 16913 | f2719b387380 |
child 33721 | 24849d53697d |
--- a/tests/test-merge6.t Tue Jun 20 17:25:57 2017 -0400 +++ b/tests/test-merge6.t Tue Jun 20 17:31:18 2017 -0400 @@ -2,7 +2,7 @@ > import sys, os > print "merging for", os.path.basename(sys.argv[1]) > EOF - $ HGMERGE="python ../merge"; export HGMERGE + $ HGMERGE="$PYTHON ../merge"; export HGMERGE $ hg init A1 $ cd A1