Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-filebranch.t
changeset 33286 2428e8ec0793
parent 22896 7e9cbb9c6053
child 33721 24849d53697d 
--- a/tests/test-filebranch.t	Tue Jun 20 17:25:57 2017 -0400
+++ b/tests/test-filebranch.t	Tue Jun 20 17:31:18 2017 -0400
@@ -5,7 +5,7 @@
   > import sys, os
   > print "merging for", os.path.basename(sys.argv[1])
   > EOF
-  $ HGMERGE="python ../merge"; export HGMERGE
+  $ HGMERGE="$PYTHON ../merge"; export HGMERGE
 
 Creating base:
mercurial