From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 14 Apr 2011 19:26:18 GMT
Subject: Re: textconv not invoked when viewing merge commit
Message-ID: <7vipughbxh.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20110414190901.GA1184@sigill.intra.peff.net>

Jeff King <peff@peff.net> writes:

> We just dump the binary goo all over the terminal. So I think the whole
> combined-diff code path needs to learn how to handle binaries properly.

How would you show multi-way diffs for binary files?

It would probably be sufficient to say "binary files differ" at the
beginning of the patch-combining codepath of the combined diff, which
would at least keep the --raw -c/--cc output working.