merge-recursive: check for file level conflicts then get new name
[gitweb.git] / contrib / buildsystems /
drwxr-xr-x   parent (dest: contrib; base: f6f775591881036a3c4bfcf6737c9119c251537d)
-rw-r--r-- 1100 Generators.pm
drwxr-xr-x - Generators
-rwxr-xr-x 11033 engine.pl
-rwxr-xr-x 1208 generate
-rwxr-xr-x 6675 parse.pl