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>
Matt McCutchen committed
Oct 18, 2008 at 20:40 UTC
e137a892d88cc40d7c0df45c06c08d144f7b3ce2
1 file changed
+1
-1
merge-recursive.c
+1
-1
@@ -1332,7 +1332,7 @@ static int merge_recursive_config(const char *var, const char *value, void *cb)
1332
o->merge_rename_limit = git_config_int(var, value);
1333
return 0;
1334
}
1335
- return git_default_config(var, value, cb);
1335
+ return git_xmerge_config(var, value, cb);
1336
}
1337
1338
void init_merge_options(struct merge_options *o)