merge-recursive: fix overwriting dirty files involved in renames
[gitweb.git] / gitweb / static /
drwxr-xr-x   parent (dest: gitweb; base: e0052f4613cd8f586b0b9975fedffce268ca6ce9)
-rw-r--r-- 115 git-favicon.png
-rw-r--r-- 207 git-logo.png
-rw-r--r-- 10637 gitweb.css
drwxr-xr-x - js