stash: invoke rerere in case of conflict
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 743bf6d8b07f0c5717bf5c37b8b50ae9de619c83)
-rw-r--r-- 2445 apache.conf
-rw-r--r-- 24 passwd
-rw-r--r-- 227 ssl.cnf