merge: make branch.<name>.mergeoptions correctly override merge.<option>
[git/mjg.git] / RelNotes
blob7b9bde663bd5b2b8eec6b7e91c1de275f6afa460
1 Documentation/RelNotes-1.7.0.txt