Merge branch 'da/mergetools-p4' into maint

diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
index a477453e2ef8ffedafb2dd05e00f507cd112bc97..e127f35db9d12dba84cbf0503628ab5d9a3fc24f 100755 (executable)
--- a/t/t1300-repo-config.sh
+++ b/t/t1300-repo-config.sh
@@ -391,7 +391,7 @@ test_expect_success 'get bool variable with empty value' \
 
 test_expect_success 'no arguments, but no crash' '
        test_must_fail git config >output 2>&1 &&
-       grep usage output
+       test_i18ngrep usage output
 '
 
 cat > .git/config << EOF