From: Matt McCutchen <matt@mattmccutchen.net>
Date: Sun, 19 Oct 2008 00:40:50 +0000 (-0400)
Subject: git-merge-recursive: honor merge.conflictstyle once again
X-Git-Tag: v1.6.1-rc1~138
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e137a892d88cc40d7c0df45c06c08d144f7b3ce2;p=git.git

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 <matt@mattmccutchen.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

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)