From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 23 May 2018 05:38:22 +0000 (+0900)
Subject: Merge branch 'en/unpack-trees-split-index-fix'
X-Git-Tag: v2.18.0-rc0~44
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d658196f3c4b2478ebdff638e2c3e4fb2f9cbba2

Merge branch 'en/unpack-trees-split-index-fix'

The split-index feature had a long-standing and dormant bug in
certain use of the in-core merge machinery, which has been fixed.

* en/unpack-trees-split-index-fix:
unpack_trees: fix breakage when o->src_index != o->dst_index
---

d658196f3c4b2478ebdff638e2c3e4fb2f9cbba2