Support a merge with conflicting gitlink change
[gitweb.git] / gitweb /
drwxr-xr-x   parent (dest: ; base: ff72af00f86cbbaaab57c886c70f9799715ca02f)
-rw-r--r-- 8084 INSTALL
-rw-r--r-- 12443 README
-rw-r--r-- 164 git-favicon.png
-rw-r--r-- 208 git-logo.png
-rw-r--r-- 7112 gitweb.css
-rwxr-xr-x 167582 gitweb.perl
drwxr-xr-x - test