merge-recursive: check for file level conflicts then get new name
[gitweb.git] / gitweb /
drwxr-xr-x   parent (dest: ; base: f6f775591881036a3c4bfcf6737c9119c251537d)
-rw-r--r-- 14694 INSTALL
-rw-r--r-- 5641 Makefile
-rw-r--r-- 2392 README
-rwxr-xr-x 252222 gitweb.perl
drwxr-xr-x - static