Merge branch 'dl/merge-autostash'

Test fix. * dl/merge-autostash: t5520: avoid alternation in grep's BRE (not POSIX)

Junio C Hamano committed May 24, 2020 at 19:39 UTC 4cf237c0d4cc17a1a49023eb0b3a4051b8978450

No changes.