Add 'merge' mode to 'git reset'
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 9e8ecea)
-rw-r--r-- 659 apache.conf
-rw-r--r-- 227 ssl.cnf