Merge branch 'jc/checkout-merge-base'

diff --git a/contrib/fast-import/git-p4.bat b/contrib/fast-import/git-p4.bat
index 6524a54c6714868dd6bccfb760003542a7e031d9..9f97e884f5c3cae9e89164c9590959ba487a89bd 100644 (file)
--- a/contrib/fast-import/git-p4.bat
+++ b/contrib/fast-import/git-p4.bat
@@ -1 +1 @@
-python "%~d0%~p0git-p4" %*
+@python "%~d0%~p0git-p4" %*