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