[PATCH] git-merge-recursive: honor merge.conflictstyle once again

From

Matt McCutchen <matt@mattmccutchen.net>

Date

Oct 19, 2008, 00:40 UTC

Message-ID

<1224376850.19061.1.camel@mattlaptop2.local>

Signed-off-by: Matt McCutchen <matt@mattmccutchen.net>
---
 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