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>		2010-03-20 20:36:10 -07:00
..
xdiff.h	xdl_merge(): move file1 and file2 labels to xmparam structure	2010-03-20 20:36:10 -07:00
xdiffi.c
xdiffi.h
xemit.c
xemit.h
xinclude.h
xmacros.h
xmerge.c	xdl_merge(): move file1 and file2 labels to xmparam structure	2010-03-20 20:36:10 -07:00
xpatience.c
xprepare.c
xprepare.h
xtypes.h
xutils.c	xutils: Fix xdl_recmatch() on incomplete lines	2009-08-23 14:38:43 -07:00
xutils.h