mergetool: honor tempfile configuration when resolving delete conflicts
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: a2986045e3da24c850da03eaf2f2e2a56f8d4fff)
-rw-r--r-- 4862 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