Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes: > Maybe even both. > > As Linus has stated in the other reply, up to three lines between two > conflicts could be "merged" with the conflicts by default, because less or > equally much screen estate would used. > > So I am thinking about an interface that is not too painful. I think there is no excuse not to coalesce hunks separated by three lines or less, so we can first get immediate improvement without any configuration or tweaking. My "less than N alnums" was ill thought out overengineering, and Linus's improvement is much cleaner. - 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
