notes: add notes.mergeStrategy option to select default strategy
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: d2d68d9975da4a15dfca0e6e59001948e5bf57f9)
-rw-r--r-- 4661 apache.conf
-rw-r--r-- 339 broken-smart-http.sh
-rwxr-xr-x 513 error.sh
-rw-r--r-- 24 passwd
-rw-r--r-- 227 ssl.cnf