aboutsummaryrefslogtreecommitdiff
path: root/mergetools/araxis
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-01-31 13:32:09 -0800
committerJunio C Hamano <gitster@pobox.com>2017-01-31 13:32:09 -0800
commit14beee0d0de56d56a8a61e442754644e16c5ed1a (patch)
tree094ebb9764e0f2b2cd722d5b5e47779ac1519c7b /mergetools/araxis
parentf5f55a1046d85bd78244d25617358f48619785f8 (diff)
parent7675c7bd01b8d39dc3c1e8385403f0307be31712 (diff)
downloadgit-14beee0d0de56d56a8a61e442754644e16c5ed1a.tar.gz
git-14beee0d0de56d56a8a61e442754644e16c5ed1a.tar.xz
Merge branch 'jk/grep-e-could-be-extended-beyond-posix' into maint
Tighten a test to avoid mistaking an extended ERE regexp engine as a PRE regexp engine. * jk/grep-e-could-be-extended-beyond-posix: t7810: avoid assumption about invalid regex syntax
Diffstat (limited to 'mergetools/araxis')
0 files changed, 0 insertions, 0 deletions