merge-recursive: Provide more info in conflict markers with file renames
[gitweb.git] / compat / vcbuild /
drwxr-xr-x   parent (dest: compat; base: 3c217c077a86)
-rw-r--r-- 1906 README
drwxr-xr-x - include
drwxr-xr-x - scripts