merge-recursive: Fix deletion of untracked file in rename/delete conflicts
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 531357a4cc2b93ec68099890b835f50e462ceab7)
-rw-r--r-- 2400 apache.conf
-rw-r--r-- 24 passwd
-rw-r--r-- 227 ssl.cnf