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-rename-merge2.t
changeset 39707 5abc47d4ca6b
parent 39429 7450f6500b6e
child 42152 344066b54a7b 
--- 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
mercurial