# HG changeset patch # User Matt Harbison # Date 2018-10-01 23:39:05 # Node ID 2b4c8fa0850403d63949b0d34da4fdad116f18bf # Parent 85c8ff26d698eb585cef18bed0a7fe646274b57e py3: quote $PYTHON in test-merge-symlinks.t diff --git a/tests/test-merge-symlinks.t b/tests/test-merge-symlinks.t --- a/tests/test-merge-symlinks.t +++ b/tests/test-merge-symlinks.t @@ -38,7 +38,7 @@ a file, once as a link. Bundle was gener 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 @@ merge working directory $ 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