merge-recursive: Provide more info in conflict markers with file renames
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 3c217c077a86)
-rw-r--r-- 2400 apache.conf
-rw-r--r-- 24 passwd
-rw-r--r-- 227 ssl.cnf