t/lib-httpd/apache.conf: do not use LockFile in apache >= 2.4
[gitweb.git] / t / t3032-merge-recursive-options.sh
2010-08-27 merge-recursive: options to ignore whitespace changes