gitweb / git-logo.pngon commit xdiff-merge: optionally show conflicts in "diff3 -m" style (e0af48e)
gitweb/git-logo.png