merge-recursive: Consider modifications in rename/rename(2to1) conflicts
[gitweb.git] / gitweb /
drwxr-xr-x   parent (dest: ; base: 434b8525e7a68893106f6360ff0a261f03c37512)
-rw-r--r-- 10929 INSTALL
-rw-r--r-- 4769 Makefile
-rw-r--r-- 23376 README
-rwxr-xr-x 221547 gitweb.perl
drwxr-xr-x - static