Merge branch 'jk/two-way-merge-corner-case-fix'
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 3979580265bac968c30ce203022d7a8294710909)
-rw-r--r-- 4530 apache.conf
-rwxr-xr-x 349 broken-smart-http.sh
-rw-r--r-- 24 passwd
-rw-r--r-- 227 ssl.cnf