summaryrefslogtreecommitdiff
path: root/mergetools/vimdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-01-18 13:49:54 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-01-18 13:49:54 -0800
commitbb20dbbc2089b33bd3ed83fb700fa5dfe76a5c0e (patch)
tree7e4efab0c0c980411a66b457e585700f735f2a78 /mergetools/vimdiff
parentMerge branch 'rb/hpe' (diff)
parentMerge branch 'sg/test-bash-version-fix' (diff)
downloadtgif-bb20dbbc2089b33bd3ed83fb700fa5dfe76a5c0e.tar.xz
Merge branch 'sg/test-bash-version-fix'
The test suite tried to see if it is run under bash, but the check itself failed under some other implementations of shell (notably under NetBSD). This has been corrected. * sg/test-bash-version-fix: test-lib: check Bash version for '-x' without using shell arrays
Diffstat (limited to 'mergetools/vimdiff')
0 files changed, 0 insertions, 0 deletions