checkout -m --conflict=diff3: add a label for ancestor
[gitweb.git] / contrib / buildsystems / Generators /
drwxr-xr-x   parent (dest: contrib/buildsystems; base: c4151629e7019d072cefdac992e164820ce9ed1c)
-rw-r--r-- 5063 QMake.pm
-rw-r--r-- 16344 Vcproj.pm