gitweb / git-favicon.pngon commit merge-recursive: Fix multiple file rename across D/F conflict (ae74548)
gitweb/git-favicon.png