merge: teach -Xours/-Xtheirs to symbolic link merge
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: fd48b464747c275b3d014b3f14d60d9ac19d184a)
-rw-r--r-- 6793 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