Hi, On Fri, 15 Feb 2008, Linus Torvalds wrote: > On Fri, 15 Feb 2008, Junio C Hamano wrote: > > > > I think there is no excuse not to coalesce hunks separated by three > > lines or less > > Well, I think the two line limit is the "unquestionable" one, since > that's the one that actually results in fewer lines over-all. Well, I hit a problem. It is visible in t7201-co.sh: Suppose you have these files new1 orig new2 1 1 1 2 2 3 3 3 4 4 4 5 5 5 6 7 6 7 8 7 8 8 In other words: if the "6" was removed in the first case, and the "2" in the second case, all of a sudden changes which were not really conflicting (if one side was unchanged, it is considered a resolvable "conflict") now _will_ conflict. In the upcoming patch, I now restrict this merging of conflicts to non-resolvable conflicts only. Will send it out shortly. 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
