Code

Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-config
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2011 22:03:25 +0000 (15:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2011 22:10:36 +0000 (15:10 -0700)
commit541d1fa85ca4741e8b6db281f3d788dcfc423bdc
tree4d8309a5e271cc0891fd4c6c10550e73625e658b
parentec014eac0e9e6f30cbbca616090fa2ecf74797e7
parent0d8fc3efc65df74a2b39b3f9798861a1b2055b62
Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-config

* jc/maint-branch-mergeoptions:
  merge: make branch.<name>.mergeoptions correctly override merge.<option>
builtin/merge.c
t/t7600-merge.sh