merge_file(): add comment explaining behavior wrt conflict style
[git/kirr.git] / gitweb / git-favicon.png
blobaae35a70e70351fe6dcb3e905e2e388cf0cb0ac3
gitweb/git-favicon.png