Clemens Buchacher wrote: > On Fri, Aug 13, 2010 at 03:00:31PM -0500, Jonathan Nieder wrote: >> Maybe it should use both the pre- and post-image? [...] > So I think we get better behavior if we ignore the pre-image. > Although the difference is probably minuscule. As long as you’ve thought it over, I’m happy with it. As you say, the postimage matching without the preimage matching should be a rare event. FWIW what I was imagining was some structured binary format: With A some long string, patch 1: A --> AAA Patch 2: AA --> AAA Ideally one would want an attempt to apply patch 2 to result in a conflict. Probably that is far-fetched. -- 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