Merge branch 'da/difftool-dir-diff-fix' into da/t7800-cleanup

diff --git a/t/t0030-stripspace.sh b/t/t0030-stripspace.sh
index c1f6411eb2d8d04585faf6d9289bd50d7c5f52cf..bbf3e39e3d229fbda5b7e40e9caca3aba2e1f52b 100755 (executable)
--- a/t/t0030-stripspace.sh
+++ b/t/t0030-stripspace.sh
@@ -432,7 +432,7 @@ test_expect_success '-c with changed comment char' '
        test_cmp expect actual
 '
 
-test_expect_failure '-c with comment char defined in .git/config' '
+test_expect_success '-c with comment char defined in .git/config' '
        test_config core.commentchar = &&
        printf "= foo\n" >expect &&
        printf "foo" | (