diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-04-17 21:06:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-17 21:06:11 -0700 |
| commit | 0fa0514b9172186d018c884da296ac6705c3e07c (patch) | |
| tree | f9a5ceda42948715bd283727e1b93fa13548163b /combine-diff.c | |
| parent | Merge branch 'maint-1.6.0' into maint-1.6.1 (diff) | |
| parent | Fix buffer overflow in config parser (diff) | |
| download | git-0fa0514b9172186d018c884da296ac6705c3e07c.tar.gz git-0fa0514b9172186d018c884da296ac6705c3e07c.zip | |
Merge branch 'maint-1.6.0' into maint-1.6.1
* maint-1.6.0:
Fix buffer overflow in config parser
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions