Merge branch 'ta/config-set-1'

diff --git a/t/t9809-git-p4-client-view.sh b/t/t9809-git-p4-client-view.sh
index e80db7aab3fd0384fb80f2735d927a26bf9114f5..897b3c3034efcab3af88d8eddc4670e274361dd5 100755 (executable)
--- a/t/t9809-git-p4-client-view.sh
+++ b/t/t9809-git-p4-client-view.sh
@@ -365,7 +365,7 @@ test_expect_success 'wildcard files submit back to p4, client-spec case' '
        (
                cd "$git" &&
                echo git-wild-hash >dir1/git-wild#hash &&
-               if test_have_prereq !MINGW !CYGWIN
+               if test_have_prereq !MINGW,!CYGWIN
                then
                        echo git-wild-star >dir1/git-wild\*star
                fi &&
@@ -379,7 +379,7 @@ test_expect_success 'wildcard files submit back to p4, client-spec case' '
        (
                cd "$cli" &&
                test_path_is_file dir1/git-wild#hash &&
-               if test_have_prereq !MINGW !CYGWIN
+               if test_have_prereq !MINGW,!CYGWIN
                then
                        test_path_is_file dir1/git-wild\*star
                fi &&