Merge branch 'nf/mergetool-prompt' into HEAD

diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
index 6767da87cba9589222b033c80b605b832f708baf..3d6f1db9da95cefa02391792500b9577d4ca9902 100755 (executable)
--- a/t/t1300-repo-config.sh
+++ b/t/t1300-repo-config.sh
@@ -1144,6 +1144,9 @@ test_expect_success 'urlmatch' '
                cookieFile = /tmp/cookie.txt
        EOF
 
+       test_expect_code 1 git config --bool --get-urlmatch doesnt.exist https://good.example.com >actual &&
+       test_must_be_empty actual &&
+
        echo true >expect &&
        git config --bool --get-urlmatch http.SSLverify https://good.example.com >actual &&
        test_cmp expect actual &&