Code

merge: make branch.<name>.mergeoptions correctly override merge.<option>