Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-config
* jc/maint-branch-mergeoptions: merge: make branch.<name>.mergeoptions correctly override merge.<option>
Junio C Hamano committed
May 6, 2011 at 15:03 UTC
541d1fa85ca4741e8b6db281f3d788dcfc423bdc
No changes.