3 commits

Author	SHA1	Message	Date
Junio C Hamano	c236bcd061	git-merge-recursive: learn to honor merge.conflictstyle ... This teaches the low-level ll_xdl_merge() routine to honor merge.conflictstyle configuration variable, so that merge-recursive strategy can show the conflicts in the style of user's choice. Signed-off-by: Junio C Hamano <gitster@pobox.com>	2008-08-30 19:41:44 -07:00
Johannes Schindelin	ef90d6d420	Provide git_config with a callback-data parameter ... git_config() only had a function parameter, but no callback data parameter. This assumes that all callback functions only modify global variables. With this patch, every callback gets a void * parameter, and it is hoped that this will help the libification effort. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2008-05-14 12:34:44 -07:00
Junio C Hamano	525ab63950	merge-recursive: split low-level merge functions out. ... This moves low-level merge functions out of merge-recursive.c and places them in a new separate file, ll-merge.c Signed-off-by: Junio C Hamano <gitster@pobox.com>	2008-02-18 00:46:13 -08:00