merge-recursive: avoid incorporating uncommitted changes in a merge
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 65170c07d466)
-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