Don't update unchanged merge entries
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 7f8ab8dc07ba4e892d0c2b5e7ac8436f9e845920)
-rw-r--r-- 642 apache.conf
-rw-r--r-- 227 ssl.cnf