merge-recursive: make "CONFLICT (rename/delete)" message show both paths
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: b26d87f2da22a5970b15bebe588bcd6ccac98e9b)
-rw-r--r-- 6375 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