summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <Johannes.Schindelin@gmx.de>2006-07-26 16:33:18 +0200
committerLibravatar Junio C Hamano <junkio@cox.net>2006-07-26 12:24:15 -0700
commit2b5d2d8792c861913d48bcfe02d8a6049c3911f5 (patch)
tree0b3f170abb7b1f6b83ce57784cfbd9d9a3da3ff9 /git-merge-resolve.sh
parentt4112: simplify the test and remove unneeded working tree file. (diff)
downloadtgif-2b5d2d8792c861913d48bcfe02d8a6049c3911f5.tar.xz
git-instaweb: some Apache have mod_cgi builtin
So test for it, and do not always try to load mod_cgi.o. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions