git notes merge: Initial implementation handling trivial merges only
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 75ef3f4a5cc69b21bc825ed0e739030d77a4f077)
-rw-r--r-- 1529 apache.conf
-rw-r--r-- 227 ssl.cnf