Johannes Schindelin 857b933e04 xdiff: add xdl_merge() ... This new function implements the functionality of RCS merge, but in-memory. It returns < 0 on error, otherwise the number of conflicts. Finding the conflicting lines can be a very expensive task. You can control the eagerness of this algorithm: - a level value of 0 means that all overlapping changes are treated as conflicts, - a value of 1 means that if the overlapping changes are identical, it is not treated as a conflict. - If you set level to 2, overlapping changes will be analyzed, so that almost identical changes will not result in huge conflicts. Rather, only the conflicting lines will be shown inside conflict markers. With each increasing level, the algorithm gets slower, but more accurate. Note that the code for level 2 depends on the simple definition of mmfile_t specific to git, and therefore it will be harder to port that to LibXDiff. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>		2006-12-02 17:28:19 -08:00
..
xdiff.h	xdiff: add xdl_merge()	2006-12-02 17:28:19 -08:00
xdiffi.c	xdiff: add xdl_merge()	2006-12-02 17:28:19 -08:00
xdiffi.h	xdiff: add xdl_merge()	2006-12-02 17:28:19 -08:00
xemit.c
xemit.h
xinclude.h
xmacros.h
xmerge.c	xdiff: add xdl_merge()	2006-12-02 17:28:19 -08:00
xprepare.c
xprepare.h
xtypes.h
xutils.c
xutils.h