![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 11 May 2011 18:38:36 +0000 (11:38 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 11 May 2011 18:38:36 +0000 (11:38 -0700) | ||
| commit | c7fe5b61e15cc5195e33f7d5e5ec452e6966c1ad | |
| tree | bc8b989475dcb5abacff4135df4bc7aa8de43461 | tree | snapshot |
| parent | bd9a2688454c09431101869e75c5a47f08c05b1a | commit | diff |
| parent | 0d8fc3efc65df74a2b39b3f9798861a1b2055b62 | commit | diff |
Merge branch 'jc/maint-branch-mergeoptions'
* jc/maint-branch-mergeoptions:
merge: make branch.<name>.mergeoptions correctly override merge.<option>
Conflicts:
builtin/merge.c
* jc/maint-branch-mergeoptions:
merge: make branch.<name>.mergeoptions correctly override merge.<option>
Conflicts:
builtin/merge.c
| builtin/merge.c | diff1 | | | | blob | history |
| t/t7600-merge.sh | diff1 | | diff2 | | blob | history |