# [PATCH] git-merge-recursive: honor merge.conflictstyle once again 2 messages from 2008-10-19 to 2008-10-19. Participants: Matt McCutchen, Junio C Hamano. Thread: https://gitlist.dev/t/15957 ## Matt McCutchen, 2008-10-19 00:40 Subject: [PATCH] git-merge-recursive: honor merge.conflictstyle once again Message-ID: <1224376850.19061.1.camel@mattlaptop2.local> URL: https://gitlist.dev/e/1224376850.19061.1.camel%40mattlaptop2.local ``` This was originally implemented in c236bcd06138bcbc929b86ad1a513635bf4847b2 but was lost to a mismerge in 9ba929ed652f5ed7707f1c684999af4ad02c4925. Signed-off-by: Matt McCutchen --- merge-recursive.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/merge-recursive.c b/merge-recursive.c index 245232a..7472d3e 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) -- 1.6.0.2.545.g6cb4a ``` ## Junio C Hamano, 2008-10-19 21:50 Subject: Re: [PATCH] git-merge-recursive: honor merge.conflictstyle once again Message-ID: <7vmyh05k6j.fsf@gitster.siamese.dyndns.org> URL: https://gitlist.dev/e/7vmyh05k6j.fsf%40gitster.siamese.dyndns.org In-Reply-To: <1224376850.19061.1.camel@mattlaptop2.local> ``` Matt McCutchen writes: > This was originally implemented in c236bcd06138bcbc929b86ad1a513635bf4847b2 > but was lost to a mismerge in 9ba929ed652f5ed7707f1c684999af4ad02c4925. Good eyes; thanks. ```