summaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-04-23 13:02:15 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-04-23 13:02:15 -0700
commite22a81ca54448fb49847ff72be0a8859bcc015ae (patch)
tree3f3f63ce6d400fa026741cdae51416a666e4ccdb /mergetools
parentMerge branch 'rj/submodule-mswin-path' (diff)
parentt9400: fix gnuism in grep (diff)
downloadtgif-e22a81ca54448fb49847ff72be0a8859bcc015ae.tar.xz
Merge branch 'bw/test-fix-grep-gnuism'
Fix two places that were the only place in the test suite that gave "a\+" to platform grep and expected it to mean one or more "a", which is a blatant GNUism. * bw/test-fix-grep-gnuism: t9400: fix gnuism in grep
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions