Merge branch 'cb/test-use-ere-for-alternation'master
commit56219baf1eae50134ee05eaa64e26e7f1207042c
authorJunio C Hamano <gitster@pobox.com>
Sun, 31 May 2020 18:38:44 +0000 (31 11:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 31 May 2020 18:38:44 +0000 (31 11:38 -0700)
treeea86737747e013cbfe89b2272992fcb7cd4debfc
parent68f30e280d6ca282e189d1c0558bcd488c173b3b
parent46022ca34f28b0e9571a40f219b2d357b1ae497d
Merge branch 'cb/test-use-ere-for-alternation'

Portability fix for tests added recently.

* cb/test-use-ere-for-alternation:
  t: avoid alternation (not POSIX) in grep's BRE
t/t4202-log.sh