From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 13 Feb 2008 01:34:09 GMT
Subject: Re: [PATCH] xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM
Message-ID: <7v3arxzlke.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <alpine.LSU.1.00.0802130108060.3870@racer.site>

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> When a merge conflicts, there are often common lines that are not really
> common, such as empty lines or lines containing a single curly bracket.
>
> With XDL_MERGE_ZEALOUS_ALNUM, we use the following heuristics: when a
> hunk does not contain any letters or digits, it is treated as conflicting.

I like the general direction.

This might need to be loosened further if we want to cover
Voltage's case where the inconveniently common hunk had another
line, "int err;", which had alnums.  Perhaps we would want to
say "max N alnums" instead of "no alnums".