merge: make branch.<name>.mergeoptions correctly override merge.<option>
[git/dscho.git] / gitweb / git-logo.png
blobf4ede2e944868b9a08401dafeb2b944c7166fd0a
gitweb/git-logo.png