Skip to content
Browse files

git-merge-recursive: honor merge.conflictstyle once again

This was originally implemented in c236bcd
but was lost to a mismerge in 9ba929e.

Signed-off-by: Matt McCutchen <matt@mattmccutchen.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information...
1 parent 971e835 commit e137a892d88cc40d7c0df45c06c08d144f7b3ce2 @mattmccutchen mattmccutchen committed with gitster Oct 18, 2008
Showing with 1 addition and 1 deletion.
  1. +1 −1 merge-recursive.c
View
2 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)

0 comments on commit e137a89

Please sign in to comment.
Something went wrong with that request. Please try again.