Merge branch 'da/mergetools-meld-output-opt-on-macos' into maint

diff --git a/t/t1309-early-config.sh b/t/t1309-early-config.sh
index 1af8c454cfa715d5694c16b4848428ae0b75eda6..3dda215e8e2f37c049a3169cecdb3e43ddea5dfb 100755 (executable)
--- a/t/t1309-early-config.sh
+++ b/t/t1309-early-config.sh
@@ -77,7 +77,7 @@ test_with_config () {
 
 test_expect_success 'ignore .git/ with incompatible repository version' '
        test_with_config "[core]repositoryformatversion = 999999" 2>err &&
-       grep "warning:.* Expected git repo version <= [1-9]" err
+       test_i18ngrep "warning:.* Expected git repo version <= [1-9]" err
 '
 
 test_expect_failure 'ignore .git/ with invalid repository version' '