From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 30 Oct 2020 20:04:23 +0000 (-0700)
Subject: Merge branch 'en/t7518-unflake'
X-Git-Tag: v2.30.0-rc0~147
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=678c787c00d88d06b7dd7335f9341b3164b009f9;p=thirdparty%2Fgit.git

Merge branch 'en/t7518-unflake'

Work around flakiness in a test.

* en/t7518-unflake:
  t7518: fix flaky grep invocation
---

678c787c00d88d06b7dd7335f9341b3164b009f9