gitweb / static / git-favicon.pngon commit merge overwrites unstaged changes in renamed file (30fd3a5)
gitweb/static/git-favicon.png