diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-11 11:38:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-11 11:38:36 -0700 |
| commit | c7fe5b61e15cc5195e33f7d5e5ec452e6966c1ad (patch) | |
| tree | bc8b989475dcb5abacff4135df4bc7aa8de43461 /base85.c | |
| parent | bd9a2688454c09431101869e75c5a47f08c05b1a (diff) | |
| parent | 0d8fc3efc65df74a2b39b3f9798861a1b2055b62 (diff) | |
| download | git-c7fe5b61e15cc5195e33f7d5e5ec452e6966c1ad.tar.gz | |
Merge branch 'jc/maint-branch-mergeoptions'
* jc/maint-branch-mergeoptions:
merge: make branch.<name>.mergeoptions correctly override merge.<option>
Conflicts:
builtin/merge.c
Diffstat (limited to 'base85.c')
0 files changed, 0 insertions, 0 deletions