Merge branch 'mn/sideband-no-ansi' into maint

diff --git a/t/t4055-diff-context.sh b/t/t4055-diff-context.sh
index 97172b46b2afd52ca8f278f9525da01a56823e59..cd0454356a6ea26c630f76748dd2c4f73bed8526 100755 (executable)
--- a/t/t4055-diff-context.sh
+++ b/t/t4055-diff-context.sh
@@ -73,7 +73,7 @@ test_expect_success 'plumbing not affected' '
 test_expect_success 'non-integer config parsing' '
        git config diff.context no &&
        test_must_fail git diff 2>output &&
-       test_i18ngrep "bad config value" output
+       test_i18ngrep "bad numeric config value" output
 '
 
 test_expect_success 'negative integer config parsing' '