merge-recursive: Provide more info in conflict markers with file renames
[gitweb.git] / contrib / buildsystems / Generators /
drwxr-xr-x   parent (dest: contrib/buildsystems; base: 3c217c077a86)
-rw-r--r-- 5063 QMake.pm
-rw-r--r-- 16344 Vcproj.pm