Mercurial > public > mercurial-scm > hg

diff tests/test-rename-merge2.t @ 39707:5abc47d4ca6b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: quote PYTHON usage Python3 defaults to installing under "Program Files".
author Matt Harbison <matt_harbison@yahoo.com>
date Tue, 18 Sep 2018 23:47:21 -0400
parents 7450f6500b6e
children 344066b54a7b
line wrap: on
line diff
--- a/tests/test-rename-merge2.t	Tue Sep 18 22:40:03 2018 -0400
+++ b/tests/test-rename-merge2.t	Tue Sep 18 23:47:21 2018 -0400
@@ -47,7 +47,7 @@
   >     echo "--------------"
   >     echo "test L:$1 R:$2 W:$3 - $4"
   >     echo "--------------"
-  >     hg merge -y --debug --traceback --tool="$PYTHON ../merge"
+  >     hg merge -y --debug --traceback --tool="\"$PYTHON\" ../merge"
   > 
   >     echo "--------------"
   >     hg status -camC -X rev