summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-10-09 14:00:59 +0900
committerJunio C Hamano <gitster@pobox.com>2019-10-09 14:00:59 +0900
commit678a9ca629403b533da19da6772691cd68b1040d (patch)
treeef984e4f6d8cb1bc0993ee7d9f1213ab1af74d0f /merge-recursive.c
parent0b4fae553cdd5aa6713137e42cc03d396ecc1264 (diff)
parentddb3c856f32fe291b52544e177d2246c09cadd2c (diff)
Merge branch 'as/shallow-slab-use-fix'
Correct code that tried to reference all entries in a sparse array of pointers by mistake. * as/shallow-slab-use-fix: shallow.c: don't free unallocated slabs
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions