gitweb / static / git-logo.pngon commit merge & sequencer: turn "Conflicts:" hint into a comment (261f315)
gitweb/static/git-logo.png