[PATCH] git-merge-recursive: honor merge.conflictstyle once again
From: Matt McCutchen <hidden>
Date: 2016-06-15 22:45:30
Subsystem:
the rest · Maintainer:
Linus Torvalds
This was originally implemented in c236bcd06138bcbc929b86ad1a513635bf4847b2 but was lost to a mismerge in 9ba929ed652f5ed7707f1c684999af4ad02c4925. Signed-off-by: Matt McCutchen <redacted> --- 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