![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 16 May 2011 23:37:07 +0000 (16:37 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 16 May 2011 23:37:07 +0000 (16:37 -0700) | ||
| commit | 2f0db1d86bb89a30c6742b03c40b320c178b1097 | |
| tree | c79e8aca5aebc9b4384463492a4e7c0ff9050912 | tree | snapshot |
| parent | c69e8b693591bc35e8f9421eacb9d59c71807304 | commit | diff |
| parent | 0d8fc3efc65df74a2b39b3f9798861a1b2055b62 | commit | diff |
Merge branch 'jc/maint-branch-mergeoptions' into maint
* 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 |