summaryrefslogtreecommitdiff
path: root/combine-diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-06-05 19:00:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-06-05 19:00:28 (GMT)
commitc538004ccb643388020b0e362409e469ed50d054 (patch)
treecebd029e483ae1b703045d0f337e38514d85e061 /combine-diff.c
parente41f8d98e37643909e22317f2ffdd940b953af55 (diff)
parent309a9e33731a56487944dbaa00073f8ee05c9f70 (diff)
downloadgit-c538004ccb643388020b0e362409e469ed50d054.zip
git-c538004ccb643388020b0e362409e469ed50d054.tar.gz
git-c538004ccb643388020b0e362409e469ed50d054.tar.bz2
Merge branch 'jk/skip-http-tests-under-no-curl' into maint
Test clean-up. * jk/skip-http-tests-under-no-curl: tests: skip dav http-push tests under NO_EXPAT=NoThanks t/lib-httpd.sh: skip tests if NO_CURL is defined
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions