gitweb / static / git-favicon.pngon commit merge_content(): Check whether D/F conflicts are still present (4ab9a15)
gitweb/static/git-favicon.png