merge-recursive: Add comments about handling rename/add-source cases
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 7769a75e96f998b2f1ef51e8a2e88058f56fa519)
-rw-r--r-- 2400 apache.conf
-rw-r--r-- 24 passwd
-rw-r--r-- 227 ssl.cnf