summaryrefslogtreecommitdiff
path: root/t/t1021-rerere-in-workdir.sh
diff options
context:
space:
mode:
authorLibravatar Carlo Marcelo Arenas Belón <carenas@gmail.com>2020-05-19 20:44:44 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-05-20 08:57:07 -0700
commitc703309024bccbcbb3017f6dbff707bb467225a4 (patch)
tree3e940aa525e9f45291a23464a033be0b42f9cd23 /t/t1021-rerere-in-workdir.sh
parentpull: pass --autostash to merge (diff)
downloadtgif-c703309024bccbcbb3017f6dbff707bb467225a4.tar.xz
t5520: avoid alternation in grep's BRE (not POSIX)
Instead of using a BRE, that broke tests 30-32, 37-39, 42 at least with OpenBSD 6.7; use a simpler ERE. Fixes: d9f15d37f1 (pull: pass --autostash to merge, 2020-04-07) Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t1021-rerere-in-workdir.sh')
0 files changed, 0 insertions, 0 deletions