merge-recursive: apply necessary modifications for directory renames
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 3b9616f149e46e1a97bf6dd5bc727a663d92dded)
-rw-r--r-- 6928 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