gitweb / git-favicon.pngon commit mergetool: Don't keep temporary merge files unless told to (162eba8)
gitweb/git-favicon.png