From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 04 Aug 2011 19:03:39 GMT
Subject: Re: [PATCH 00/48] Handling more corner cases in merge-recursive.c
Message-ID: <7vpqkl3sok.fsf@alter.siamese.dyndns.org>
In-Reply-To: <CABPp-BE=9r+upGUD45J7fPshqQE97UMZzaA+cu_WJ1A2p_Bigg@mail.gmail.com>

Elijah Newren <newren@gmail.com> writes:

> ...  It
> would be nice to make use of the original index we had before
> unpacking, but that is overwritten at the end of unpack_trees.

I somehow thought that we can give separate src and dst index
to the unpack_tree() machinery these days. Aren't you using it?