gitweb / git-favicon.pngon commit git-revert with conflicts to behave as git-merge with conflicts (a9cb3c6)
gitweb/git-favicon.png