rerere: recalculate conflict ID when unresolved conflict is committed
[gitweb.git] / contrib / buildsystems / Generators /
drwxr-xr-x   parent (dest: contrib/buildsystems; base: bd7dfa543e0263858071b8648a55ef7ccae1085b)
-rw-r--r-- 5063 QMake.pm
-rw-r--r-- 16344 Vcproj.pm