From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 23 May 2011 23:02:58 GMT
Subject: Re: [PATCH 3/5] combine-diff: handle binary files as binary
Message-ID: <7vk4dht3z1.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20110523202734.GC6298@sigill.intra.peff.net>

Jeff King <peff@peff.net> writes:

> The big question here is what we want the output to look like. I chose
> this:
>
>   diff --combined foo
>   index 7ea6ded,6197570..9563691
>   Binary files differ
>
> which contains all of the information we have: for file "foo" there were
> two parents (at 7ea6ded and 6197570 respectively), and the resolution
> was 9563691.

Yeah, I think the above is sane and matches more-or-less the conclusion of
the previous discussion Michael quoted.

I've only read up to this patch (I wanted to conclude the first round of
today's integration round before 17:00 local) and they all looked good;
will queue the whole thing to 'pu' in the meantime.