merge & sequencer: turn "Conflicts:" hint into a comment
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 261f315bebfa9af2d09f20211960100ff06f87cb)
-rw-r--r-- 4530 apache.conf
-rwxr-xr-x 349 broken-smart-http.sh
-rw-r--r-- 24 passwd
-rw-r--r-- 227 ssl.cnf