merge-recursive: Provide more info in conflict markers with file renames
[gitweb.git] / contrib / thunderbird-patch-inline /
drwxr-xr-x   parent (dest: contrib; base: 3c217c077a86)
-rw-r--r-- 725 README
-rwxr-xr-x 1402 appp.sh