tree 562f80faa0bcffc9fac0f7814f5b97fc7de50891
parent 80e013c0fd3daf0dfe2e047bd3349056192f8b18
parent c703309024bccbcbb3017f6dbff707bb467225a4
author Junio C Hamano <gitster@pobox.com> 1590374377 -0700
committer Junio C Hamano <gitster@pobox.com> 1590374377 -0700

Merge branch 'dl/merge-autostash'

Test fix.

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