merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base
[gitweb.git] / contrib / buildsystems / Generators /
drwxr-xr-x   parent (dest: contrib/buildsystems; base: c52ff85d97c698c902870305a010e2303e297b87)
-rw-r--r-- 5063 QMake.pm
-rw-r--r-- 16344 Vcproj.pm