Subject: Re: [PATCH v2 1/4] t4059: test 'diff --cc' with a change from only few parents

From: Junio C Hamano <[email-masked]>
Date: Sat, 11 Apr 2015 22:51:10 -0700

Max Kirillov <[email-masked]> 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?