merge-tree: fix typo in "both changed identically"
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: ab5f42422d7e025c3151d91cc5ec0d20b9a80922)
-rw-r--r-- 3095 apache.conf
-rwxr-xr-x 349 broken-smart-http.sh
-rw-r--r-- 24 passwd
-rw-r--r-- 227 ssl.cnf