diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-05-06 15:03:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-06 15:10:36 -0700 |
| commit | 541d1fa85ca4741e8b6db281f3d788dcfc423bdc (patch) | |
| tree | 4d8309a5e271cc0891fd4c6c10550e73625e658b /templates | |
| parent | Git 1.7.5 (diff) | |
| parent | merge: make branch.<name>.mergeoptions correctly override merge.<option> (diff) | |
| download | tgif-541d1fa85ca4741e8b6db281f3d788dcfc423bdc.tar.xz | |
Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-config
* jc/maint-branch-mergeoptions:
merge: make branch.<name>.mergeoptions correctly override merge.<option>
Diffstat (limited to 'templates')
0 files changed, 0 insertions, 0 deletions