Merge branch 'rh/mergetool-regression-fix'
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 7cef7fadab5de8ae39ece585005b19334aee6a4d)
-rw-r--r-- 6375 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