merge-recursive: avoid spurious rename/rename conflict from dir renames
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 6e7e027fe5f4a8d61597a86e7f2b6087e23a759c)
-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