Hi, On Mon, 4 Jun 2007, Linus Torvalds wrote: > I really think this would be better off using the crlf-like heuristics. I don't know. Given that it took quite a while to actually hit this bug... > 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" Yes, you're right. However, if you call git-merge-file, you have to be aware of what it does. It is a _standalone_ program, meant to make it easier to write scripts. Maybe it is not worth detecting binary files _at all_ in merge-file. Ciao, Dscho - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
