merge-recursive: Improve handling of rename target vs. directory addition
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 51931bf08e7de1f597d36bc2fd38b5310b6da7dd)
-rw-r--r-- 2400 apache.conf
-rw-r--r-- 24 passwd
-rw-r--r-- 227 ssl.cnf