gitweb / git-logo.pngon commit merge.conflictstyle: choose between "merge" and "diff3 -m" styles (b541248)
gitweb/git-logo.png