Documentation: git diff --check detects conflict markers
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 30211fb68d64c2b3852da5b5f846d8d52d70c9c1)
-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