From: Junio C Hamano Date: Fri, 15 Feb 2008 17:32:57 GMT Subject: Re: [PATCH] xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM Message-ID: <7vlk5mgm5y.fsf@gitster.siamese.dyndns.org> In-Reply-To: Johannes Schindelin 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.