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