summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-07-16 18:33:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-07-16 18:33:01 (GMT)
commitce33d610969d2d39db3c3fe99fe5bae89dfab75a (patch)
tree4295b124755293fe3fc0e0748c73d7e882a6f47b /builtin/merge.c
parent5e40e41f1c51581d8cd8f3816de49934fec784fc (diff)
parent00f6991d4bb35e76836d4ce8f2eaab3e4e3b20a7 (diff)
downloadgit-ce33d610969d2d39db3c3fe99fe5bae89dfab75a.zip
git-ce33d610969d2d39db3c3fe99fe5bae89dfab75a.tar.gz
git-ce33d610969d2d39db3c3fe99fe5bae89dfab75a.tar.bz2
Merge branch 'jl/test-lint-scripts'
* jl/test-lint-scripts: t/Makefile: always test all lint targets when running tests t/Makefile: check helper scripts for non-portable shell commands too
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions