From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 29 Jul 2014 17:00:22 GMT
Subject: Re: stash-p broken?
Message-ID: <xmqq61ig3xsp.fsf@gitster.dls.corp.google.com>
In-Reply-To: <20140729092301.GA13134@peff.net>

Jeff King <peff@peff.net> writes:

> So perhaps we could do something better on the viewing side, and
> "simplify" combined merges for files with all-identical parents.

Or you can ask to show the difference with the first parent, no?

I do not think giving a single-parent diff when --cc/-c is asked
for, which is a clear indication that the caller is aware that the
commit in question is a merge, is such a good idea.