merge-recursive: Avoid doubly merging rename/add conflict contents
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 2a669c341a857f53d946dec762e6f22a54b12dd2)
-rw-r--r-- 1529 apache.conf
-rw-r--r-- 227 ssl.cnf