Andrew's git / gitweb.git / diff
?
Merge branch 'jc/maint-branch-mergeoptions' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 May 2011 23:37:07 +0000 (16:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 May 2011 23:37:07 +0000 (16:37 -0700)
* jc/maint-branch-mergeoptions:
merge: make branch.<name>.mergeoptions correctly override merge.<option>

Conflicts:
builtin/merge.c

No differences found