merge-recursive: Fix multiple file rename across D/F conflict
[gitweb.git] / contrib / buildsystems / Generators /
drwxr-xr-x   parent (dest: contrib/buildsystems; base: ae74548)
-rw-r--r-- 5063 QMake.pm
-rw-r--r-- 16344 Vcproj.pm