summaryrefslogtreecommitdiff
path: root/ll-merge.h
diff options
context:
space:
mode:
authorLibravatar Kevin Ballard <kevin@sb.org>2008-03-21 03:27:35 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-03-22 17:53:12 -0700
commit3644da7214055d2e84223b45dfca42d437fb7ea7 (patch)
tree4288d27454a52af14c0bfced7d8fa8cf66b83ad5 /ll-merge.h
parentImprove description of git filter-branch. (diff)
downloadtgif-3644da7214055d2e84223b45dfca42d437fb7ea7.tar.xz
Make git-svn tests behave better on OS X
Give lib-git-svn.sh a few alternate paths to look for apache2. Explicitly define the LockFile so httpd will actually start under OS X Signed-off-by: Kevin Ballard <kevin@sb.org> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'll-merge.h')
0 files changed, 0 insertions, 0 deletions