diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-10-16 16:16:00 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-16 16:16:00 +0900 |
| commit | 73b9c6f58358c2d6167f7a51ac06eee2fab6f5d8 (patch) | |
| tree | 2361d8691ae04f6d9af4b3a71dbec663e36fb488 /merge-recursive.c | |
| parent | eea5e03a5a4636a95d18947643252ed52bb298ce (diff) | |
| parent | 2fa233a5541d643d1adae43bcac62226cb20d92d (diff) | |
| download | git-73b9c6f58358c2d6167f7a51ac06eee2fab6f5d8.tar.gz | |
Merge branch 'jk/delta-islands-with-bitmap-reuse-delta-fix'
Fix interactions between two recent topics.
* jk/delta-islands-with-bitmap-reuse-delta-fix:
pack-objects: handle island check for "external" delta base
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions