merge-recursive: adjust to loosened "working file clobbered" check
[gitweb.git] / gitweb /
drwxr-xr-x   parent (dest: ; base: 65ac6e9)
-rw-r--r-- 3144 README
-rw-r--r-- 164 git-favicon.png
-rw-r--r-- 208 git-logo.png
-rw-r--r-- 5576 gitweb.css
-rwxr-xr-x 114911 gitweb.perl
drwxr-xr-x - test