Remove uncontested renamed files during merge.
[gitweb.git] / gitweb /
drwxr-xr-x   parent (dest: ; base: 8371234ecaaf6e14fe3f2082a855eff1bbd79ae9)
-rw-r--r-- 3144 README
-rw-r--r-- 164 git-favicon.png
-rw-r--r-- 208 git-logo.png
-rw-r--r-- 6574 gitweb.css
-rwxr-xr-x 131798 gitweb.perl
drwxr-xr-x - test