From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 05 Jun 2007 05:16:52 GMT
Subject: Re: [PATCH 3/3] git-merge-file: refuse to merge binary files
Message-ID: <7vwsyjgeuz.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <alpine.LFD.0.98.0706042059420.23741@woody.linux-foundation.org>

Linus Torvalds <torvalds@linux-foundation.org> writes:

> I really think this would be better off using the crlf-like heuristics.
>
> It's entirely possible that the "NUL character in the first X bytes" 
> heuristic is wrong for some cases, so I find it a bit nasty to hardcoding 
> it as the only rule for "it must be binary"
>
> 		Linus

On the other hand that hardcoded fallback is consistent with
diff, which is closely related to xdl_merge().  Attributes can
be specified to override this anyway, so...