gitweb / git-logo.pngon commit Be more user-friendly when refusing to do something because of conflict. (d38a30d)
gitweb/git-logo.png