X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-recursive.c;h=7472d3ecc9b8412a697a64c1307259a104e0abf9;hb=1689c5de8730ea334535337a341db3c7a21ad002;hp=245232a4083bbd8cdadf3b32a0a20db559941f8a;hpb=f4a75a416f62c0494e06cb42a11c7cc70ec9303e;p=git.git

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)