Clarify kind of conflict in merge-one-file helper
[git] / t / lib-httpd /
drwxr-xr-x   ..
-rw-r--r-- 850 apache.conf
-rw-r--r-- 227 ssl.cnf