merge-recursive: handle addition of submodule on our side of history
[git] / contrib / buildsystems / Generators /
drwxr-xr-x   ..
-rw-r--r-- 5063 QMake.pm
-rw-r--r-- 16344 Vcproj.pm