merge: make branch.<name>.mergeoptions correctly override merge.<option>
authorJunio C Hamano <gitster@pobox.com>
Thu, 5 May 2011 00:42:51 +0000 (17:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2011 22:01:56 +0000 (15:01 -0700)
commit0d8fc3e...c65df74a2b39b3f9798861a1b2055b62
tree8dbec03...5d44bc2fde3a04d5a5ada030d515e9decopy hash to clipboard (tree)
parente923eae...901ff056421b9007adcbbce271caa7b6copy hash to clipboard (diff)
builtin-merge.c
t/t7600-merge.sh