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