diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-05 15:19:34 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-05 15:19:34 -0800 |
| commit | cddec4f8aea4809131dc1b1765d6c8e2a498a58e (patch) | |
| tree | 126e27a28d41df858b34e7f85510d3a7081ed0d4 /builtin/merge.c | |
| parent | 33fba9c64e305c64b4d6f4c31f02c1dd7e8fbfa8 (diff) | |
| parent | f63c79dbc8c5670533557d311ed0e81fcfc9fe3a (diff) | |
| download | git-cddec4f8aea4809131dc1b1765d6c8e2a498a58e.tar.gz | |
Merge branch 'jc/maint-pack-object-cycle'
* jc/maint-pack-object-cycle:
pack-object: tolerate broken packs that have duplicated objects
Conflicts:
builtin/pack-objects.c
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions