t7405: verify 'merge --abort' works after submodule/path conflicts
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 587421ebddec17e6e9aaf55b61aa40ad4ad9e43e)
-rw-r--r-- 6928 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