gitweb / static / git-favicon.pngon commit merge: teach -Xours/-Xtheirs to binary ll-merge driver (a944af1)
gitweb/static/git-favicon.png