summaryrefslogtreecommitdiff
path: root/merge.c
diff options
context:
space:
mode:
authorLibravatar Lars Schneider <larsxschneider@gmail.com>2016-05-19 10:45:11 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-07-12 09:43:44 -0700
commitd9d14268309469997d8a9df5320d24ce20d1ffb7 (patch)
tree4269eb84e8a927e44a80fd24c2d77c17d98510ac /merge.c
parentGit 2.8.4 (diff)
downloadtgif-d9d14268309469997d8a9df5320d24ce20d1ffb7.tar.xz
travis-ci: enable web server tests t55xx on Linux
Install the "apache" package to run the Git web server tests on Travis-CI Linux build machines. The tests are already executed on OS X build machines since the apache web server is installed by default. Signed-off-by: Lars Schneider <larsxschneider@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions