Remove the use of '--' in merge program invocation
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 641dba49bf819dc5f4874a75b206bc7f51dc14e6)
-rw-r--r-- 642 apache.conf
-rw-r--r-- 227 ssl.cnf