merge-recursive: Provide more info in conflict markers with file renames
[gitweb.git] / t / t9603 / cvsroot / module /
drwxr-xr-x   parent (dest: t/t9603/cvsroot; base: 3c217c077a86)
-rw-r--r-- 589 a,v
-rw-r--r-- 703 b,v