merge-recursive: new function for better colliding conflict resolutions
[gitweb.git] / gitweb /
drwxr-xr-x   parent (dest: ; base: 37b65ce36bc8f79b5e8cf6f3addf586bd72f3352)
-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