Merge branch 'jc/maint-branch-mergeoptions'
commitc7fe5b61e15cc5195e33f7d5e5ec452e6966c1ad
authorJunio C Hamano <gitster@pobox.com>
Wed, 11 May 2011 18:38:36 +0000 (11 11:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 May 2011 18:38:36 +0000 (11 11:38 -0700)
treebc8b989475dcb5abacff4135df4bc7aa8de43461
parentbd9a2688454c09431101869e75c5a47f08c05b1a
parent0d8fc3efc65df74a2b39b3f9798861a1b2055b62
Merge branch 'jc/maint-branch-mergeoptions'

* jc/maint-branch-mergeoptions:
  merge: make branch.<name>.mergeoptions correctly override merge.<option>

Conflicts:
builtin/merge.c
builtin/merge.c
t/t7600-merge.sh