--- a/tests/test-merge-symlinks.t Thu Jun 21 22:07:34 2018 -0700
+++ b/tests/test-merge-symlinks.t Mon Oct 01 19:39:05 2018 -0400
@@ -38,7 +38,7 @@
Merge them and display *_ISLINK vars
merge heads
- $ hg merge --tool="$PYTHON ../echo.py"
+ $ hg merge --tool="\"$PYTHON\" ../echo.py"
merging l
HG_FILE l
HG_MY_ISLINK 1
@@ -54,7 +54,7 @@
$ hg up -C 2
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg copy l l2
- $ HGMERGE="$PYTHON ../echo.py" hg up 3
+ $ HGMERGE="\"$PYTHON\" ../echo.py" hg up 3
merging l2
HG_FILE l2
HG_MY_ISLINK 1