From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 22 Nov 2007 19:20:47 GMT
Subject: Re: [PATCH 0/5] Colors for git-add--interactive
Message-ID: <7vve7u3x4g.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <20071122045437.46ee4638@paradox.zwell.net>

Dan Zwell <dzwell@zwell.net> writes:

> My impression is that diff --cc is called any time
> that HEAD has two parents. Is this correct?

You get combined output when your index is unmerged.

Showing combined output to the user to examine may make sense,
but I think you would want to have the user pick from diff
between stage#2 and the work tree for an unmerged entry, if you
allow to pick hunks during a conflicted merge.