git-merge: add support for branch.<name>.mergeoptions