Merge branch 'en/t7518-unflake'

Work around flakiness in a test. * en/t7518-unflake: t7518: fix flaky grep invocation

Junio C Hamano committed Oct 30, 2020 at 13:04 UTC 678c787c00d88d06b7dd7335f9341b3164b009f9

No changes.