From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 12 Apr 2015 05:51:10 GMT
Subject: Re: [PATCH v2 1/4] t4059: test 'diff --cc' with a change from only few parents
Message-ID: <xmqq1tjp6gj5.fsf@gitster.dls.corp.google.com>
In-Reply-To: <20150412054332.GA28555@wheezy.local>

Max Kirillov <max@max630.net> writes:

> My exact case was that there was a change in one branch
> which was overwritten during merge conflict resolution by
> fully acepting the other branch - in a 2-parent merge. I
> started looking for a way to visualize such cases. They
> are not visible in usual diff, because they look same as
> accepting change compared to the unchange branch.

Hmph, isn't that exactly why "diff -c" exists, not "diff --cc"
that omits (usually) uninteresting hunks?