submodule: Search for merges only at end of recursive merge
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 80988783c8c417c5e914256b43ed3604cc8fa4c3)
-rw-r--r-- 2400 apache.conf
-rw-r--r-- 24 passwd
-rw-r--r-- 227 ssl.cnf