Merge branch 'jk/error-resolve-conflict-advice'
[gitweb.git] / gitweb /
drwxr-xr-x   parent (dest: ; base: d0d5ba7e6ed1f9ea7b22dc8063b782b431ad37b7)
-rw-r--r-- 14728 INSTALL
-rw-r--r-- 5641 Makefile
-rw-r--r-- 2392 README
-rwxr-xr-x 251570 gitweb.perl
drwxr-xr-x - static