git/xdiff at 9a7ea2b1f3484bb2a4bbd0b538e5a38df0356701 - git

Tree: 9a7ea2b1f3

Johannes Schindelin ee95ec5d58 xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM 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. In other words, a conflict which used to look like this: <<<<<<< a = 1; ======= output(); >>>>>>> } } } <<<<<<< output(); ======= b = 1; >>>>>>> will look like this with ZEALOUS_ALNUM: <<<<<<< a = 1; } } } output(); ======= output(); } } } b = 1; >>>>>>> To demonstrate this, git-merge-file has been switched from XDL_MERGE_ZEALOUS to XDL_MERGE_ZEALOUS_ALNUM. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>		17 years ago
..
xdiff.h	xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM	17 years ago
xdiffi.c	Remove unreachable statements	17 years ago
xdiffi.h	War on whitespace	18 years ago
xemit.c	Per-path attribute based hunk header selection.	18 years ago
xemit.h	War on whitespace	18 years ago
xinclude.h	War on whitespace	18 years ago
xmacros.h	War on whitespace	18 years ago
xmerge.c	xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM	17 years ago
xprepare.c	War on whitespace	18 years ago
xprepare.h	War on whitespace	18 years ago
xtypes.h	War on whitespace	18 years ago
xutils.c	Remove unreachable statements	17 years ago
xutils.h	War on whitespace	18 years ago