Merge branch 'jk/delta-islands-with-bitmap-reuse-delta-fix'
authorJunio C Hamano <gitster@pobox.com>
Tue, 16 Oct 2018 07:16:00 +0000 (16:16 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 Oct 2018 07:16:00 +0000 (16:16 +0900)
Fix interactions between two recent topics.

* jk/delta-islands-with-bitmap-reuse-delta-fix:
pack-objects: handle island check for "external" delta base

1  2 
builtin/pack-objects.c
Simple merge