Merge branch 'jk/two-way-merge-corner-case-fix' into maint
[gitweb.git] / gitweb /
drwxr-xr-x   parent (dest: ; base: 4766036ecdee2d45b5a955409da5e6751c3e2f05)
-rw-r--r-- 14728 INSTALL
-rw-r--r-- 5641 Makefile
-rw-r--r-- 2392 README
-rwxr-xr-x 248868 gitweb.perl
drwxr-xr-x - static