merge-recursive: Provide more info in conflict markers with file renames
[gitweb.git] / gitweb / static /
drwxr-xr-x   parent (dest: gitweb; base: 3c217c077a86)
-rw-r--r-- 115 git-favicon.png
-rw-r--r-- 207 git-logo.png
-rw-r--r-- 9007 gitweb.css
-rw-r--r-- 24528 gitweb.js