Mercurial > hg-stable

diff tests/test-merge6.t @ 33286:2428e8ec0793

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: clean up even more direct `python` calls with $PYTHON This time ones that are prefixed with =, ", ', or `. This appears to be the last of them. Differential Revision: https://phab.mercurial-scm.org/D14
author Augie Fackler <augie@google.com>
date Tue, 20 Jun 2017 17:31:18 -0400
parents f2719b387380
children 24849d53697d
line wrap: on
line diff
--- 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