| commit | fa6b1547cbb6c4b334b0fe4d7e38d2b90f880d13 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 8 May 2011 20:35:23 +0000 (8 13:35 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 8 May 2011 20:35:23 +0000 (8 13:35 -0700) | ||
| tree | 84c496b673fe36371e2b85782c50b058eacf8c16 | treesnapshot (tar.gz zip) |
| parent | 35a7c6603a0130edf00dc5bcc4b4ff67c03be89b | commitdiff |
| parent | 0d8fc3efc65df74a2b39b3f9798861a1b2055b62 | commitdiff |
Merge branch 'jc/maint-branch-mergeoptions' into next
* 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 | blobhistory | |
| t/t7600-merge.sh | diff1 | diff2 | blobhistory |