]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'dl/merge-autostash'
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 May 2020 02:39:37 +0000 (19:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 May 2020 02:39:37 +0000 (19:39 -0700)
commit4cf237c0d4cc17a1a49023eb0b3a4051b8978450
tree562f80faa0bcffc9fac0f7814f5b97fc7de50891
parent80e013c0fd3daf0dfe2e047bd3349056192f8b18
parentc703309024bccbcbb3017f6dbff707bb467225a4
Merge branch 'dl/merge-autostash'

Test fix.

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