git-merge: add support for branch.<name>.mergeoptions
[git] / t / test4012.png
t/test4012.png