Tree: 8d6888ec6a

git/xdiff

History

Jonathan Nieder a4b5e91c49 xdl_merge(): move file1 and file2 labels to xmparam structure ... The labels for the three participants in a potential conflict are all optional arguments for the xdiff merge routine; if they are NULL, then xdl_merge() can cope by omitting the labels from its output. Move them to the xmparam structure to allow new callers to save some keystrokes where they are not needed. This also has the virtue of making the xdiff merge interface more similar to merge_trees, which might make it easier to learn. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		15 years ago
..
xdiff.h	xdl_merge(): move file1 and file2 labels to xmparam structure	15 years ago
xdiffi.c	refactor: use bitsizeof() instead of 8 * sizeof()	16 years ago
xdiffi.h	Implement the patience diff algorithm	16 years ago
xemit.c	Fix various dead stores found by the clang static analyzer	16 years ago
xemit.h	…
xinclude.h	…
xmacros.h	…
xmerge.c	xdl_merge(): move file1 and file2 labels to xmparam structure	15 years ago
xpatience.c	Implement the patience diff algorithm	16 years ago
xprepare.c	Implement the patience diff algorithm	16 years ago
xprepare.h	…
xtypes.h	…
xutils.c	xutils: Fix xdl_recmatch() on incomplete lines	16 years ago
xutils.h	…