provide more errors for the "merge into empty head" case
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 4be636f42cd75f865204817c307eb1a7b464109c)
-rw-r--r-- 659 apache.conf
-rw-r--r-- 227 ssl.cnf