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