Hi, On Tue, 12 Feb 2008, Junio C Hamano wrote: > Johannes Schindelin <Johannes.Schindelin@xxxxxx> 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". 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. 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
