merge: teach -Xours/-Xtheirs to binary ll-merge driver
[gitweb.git] / contrib / buildsystems / Generators /
drwxr-xr-x   parent (dest: contrib/buildsystems; base: a944af1d)
-rw-r--r-- 5063 QMake.pm
-rw-r--r-- 16344 Vcproj.pm