test that git status works with merge conflict in, .gitmodules
[gitweb.git] / contrib / buildsystems / Generators /
drwxr-xr-x   parent (dest: contrib/buildsystems; base: 44ca0c8ed927c8e7525ceec412704ff9967ff6ac)
-rw-r--r-- 5063 QMake.pm
-rw-r--r-- 16344 Vcproj.pm