merge-recursive: add computation of collisions due to dir rename & merging
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: ea625cb0274c6907fba02f7af3ab83458b331a1e)
-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