gitweb / static / git-logo.pngon commit merge-recursive: Provide more info in conflict markers with file renames (3c217c0)
gitweb/static/git-logo.png