Merge branch 'jc/maint-branch-mergeoptions'
* jc/maint-branch-mergeoptions: merge: make branch.<name>.mergeoptions correctly override merge.<option> Conflicts: builtin/merge.c
Junio C Hamano committed
May 11, 2011 at 11:38 UTC
c7fe5b61e15cc5195e33f7d5e5ec452e6966c1ad
No changes.