merge overwrites unstaged changes in renamed file
[gitweb.git] / contrib / buildsystems / Generators /
drwxr-xr-x   parent (dest: contrib/buildsystems; base: 30fd3a5425)
-rw-r--r-- 5063 QMake.pm
-rw-r--r-- 16344 Vcproj.pm