builtin/merge: honor commit-msg hook for merges
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: f8b863598c991a5441d97e5dc59af8968ea37e37)
-rw-r--r-- 6793 apache.conf
-rw-r--r-- 339 broken-smart-http.sh
-rwxr-xr-x 513 error.sh
-rw-r--r-- 24 passwd
-rw-r--r-- 227 ssl.cnf