merge-recursive: options to ignore whitespace changes
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 4e5dd044c62f2a82de083e7cd46cad7b0d3465ae)
-rw-r--r-- 1529 apache.conf
-rw-r--r-- 227 ssl.cnf