Documentation: include 'merge.branchdesc' for merge and config as well
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: fc0aa395f3205a049e917d391e2afa93cda0c8af)
-rw-r--r-- 4622 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