From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 May 2020 02:39:37 +0000 (-0700)
Subject: Merge branch 'dl/merge-autostash'
X-Git-Tag: v2.27.0-rc2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4cf237c0d4cc17a1a49023eb0b3a4051b8978450;p=thirdparty%2Fgit.git

Merge branch 'dl/merge-autostash'

Test fix.

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

4cf237c0d4cc17a1a49023eb0b3a4051b8978450