From e137a892d88cc40d7c0df45c06c08d144f7b3ce2 Mon Sep 17 00:00:00 2001 From: Matt McCutchen Date: Sat, 18 Oct 2008 20:40:50 -0400 Subject: [PATCH] git-merge-recursive: honor merge.conflictstyle once again This was originally implemented in c236bcd06138bcbc929b86ad1a513635bf4847b2 but was lost to a mismerge in 9ba929ed652f5ed7707f1c684999af4ad02c4925. Signed-off-by: Matt McCutchen Signed-off-by: Junio C Hamano --- merge-recursive.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/merge-recursive.c b/merge-recursive.c index 245232a40..7472d3ecc 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1332,7 +1332,7 @@ static int merge_recursive_config(const char *var, const char *value, void *cb) o->merge_rename_limit = git_config_int(var, value); return 0; } - return git_default_config(var, value, cb); + return git_xmerge_config(var, value, cb); } void init_merge_options(struct merge_options *o) -- 2.26.2