merge-recursive: check for file level conflicts then get new name
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: f6f775591881036a3c4bfcf6737c9119c251537d)
-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