From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 05 Jun 2007 04:00:46 GMT
Subject: Re: [PATCH 3/3] git-merge-file: refuse to merge binary files
Message-ID: <alpine.LFD.0.98.0706042059420.23741@woody.linux-foundation.org>
In-Reply-To: <Pine.LNX.4.64.0706050337010.4046@racer.site>



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