merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: c52ff85d97c698c902870305a010e2303e297b87)
-rw-r--r-- 2400 apache.conf
-rw-r--r-- 24 passwd
-rw-r--r-- 227 ssl.cnf