gitweb / static / git-logo.pngon commit ll-merge: use a longer conflict marker for internal merge (d694a17)
gitweb/static/git-logo.png