From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 05 Dec 2018 06:56:09 GMT
Subject: Re: [PATCH v3 07/14] checkout: split into switch-branch and restore-files
Message-ID: <xmqqva48bgxi.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <CABPp-BGZF8s=ReiC=jTKKQbt1LLO72K7a_2pYbQHrw0ZeA9J5w@mail.gmail.com>

Elijah Newren <newren@gmail.com> writes:

> What depends on stage#2 coming from the commit that will become the
> first parent?

How about "git diff --cc" for a starter?  What came from HEAD's
ancestry should appear first and then what came from the side branch
that is merged into.