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

[git.git] / t / t5515 / fetch.master_.._.git

# master ../.git
0567da4d5edd2ff4bb292a465ba9e64dcad9536b                ../