git notes merge: Add automatic conflict resolvers (ours, theirs, union)
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 3228e67120a8c71bf7804a5c52448a841d6f3b58)
-rw-r--r-- 1529 apache.conf
-rw-r--r-- 227 ssl.cnf