Merge branch 'js/rebase-p-tests'

diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index 562bd215a5315757dcc7c10e311106f2c7b0ff72..22b9199d599284e9fcf5d7451b98db7ee99fffbe 100755 (executable)
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -332,7 +332,7 @@ test_expect_success 'difftool --extcmd cat arg1' '
 test_expect_success 'difftool --extcmd cat arg2' '
        echo branch >expect &&
        git difftool --no-prompt \
-               --extcmd sh\ -c\ \"cat\ \$2\" branch >actual &&
+               --extcmd sh\ -c\ \"cat\ \\\"\$2\\\"\" branch >actual &&
        test_cmp expect actual
 '