From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 21 Jul 2020 20:43:47 GMT
Subject: Re: Request for adding a "clean" merge strategy for a double-commit merge to deal with conflicts separately
Message-ID: <xmqqlfjc7g58.fsf@gitster.c.googlers.com>
In-Reply-To: <CABPp-BE2R3eUU7WD1Ovkn_OfVH6fc42DnXs5CuBTkMUcQsnCdQ@mail.gmail.com>

Elijah Newren <newren@gmail.com> writes:

> I disagree that they are "lost".  Rather, git doesn't make them very
> easy to access: git log -p won't show you any output for a merge by
> default, and the only options that exist (-c, -cc) don't do what you
> need to see how conflicts were resolved.

With "sometimes" sprinkled into appropriate places, you are 110%
right.