merge-recursive: Provide more info in conflict markers with file renames
[gitweb.git] / po /
drwxr-xr-x   parent (dest: ; base: 3c217c077a86)