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. The three-line case gets a bit less obvious since the line count doesn't change, and if the unchanged lines are complex, it might well be better to leave them as shared. What's not uncommon at all is that you have a small change that results in a new variable or similar, and then it's quite possible that the first conflict comes from a new variable declaration, and the second conflict is the "real code" change, and if there are three complex lines in between, it probably makes sense to keep them unmodified, and have two much simpler choices. In fact, in many ways, maybe we'd be better off counting (non-space) bytes rather than lines. That gets the "complexity" argument mostly right. Linus - 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
