On Thu, Aug 4, 2011 at 1:03 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Elijah Newren <newren@xxxxxxxxx> 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? Ah, yes, it appears to be possible. I have not touched that part of merge-recursive, so it still reads: opts.fn = threeway_merge; opts.src_index = &the_index; opts.dst_index = &the_index; setup_unpack_trees_porcelain(&opts, "merge"); I'll take that route to fix this. Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html