]> git.ipfire.org Git - thirdparty/git.git/commitdiff
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)
Test fix.

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


Trivial merge