Merge branch 'jk/combine-diff-binary-etc'

diff --git a/t/t7811-grep-open.sh b/t/t7811-grep-open.sh
index aedf484feeb9da05054f18ab2f4913865048fe35..a8957782cfb8fae4b7c171d4c9db24ce6cd5505e 100755 (executable)
--- a/t/t7811-grep-open.sh
+++ b/t/t7811-grep-open.sh
@@ -61,9 +61,9 @@ test_expect_success SIMPLEPAGER 'git grep -O' '
        test_cmp empty out
 '
 
-test_expect_success C_LOCALE_OUTPUT 'git grep -O --cached' '
+test_expect_success 'git grep -O --cached' '
        test_must_fail git grep --cached -O GREP_PATTERN >out 2>msg &&
-       grep open-files-in-pager msg
+       test_i18ngrep open-files-in-pager msg
 '
 
 test_expect_success 'git grep -O --no-index' '