diff options
| author | Matt McCutchen <matt@mattmccutchen.net> | 2008-10-18 20:40:50 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-10-19 14:49:38 -0700 |
| commit | e137a892d88cc40d7c0df45c06c08d144f7b3ce2 (patch) | |
| tree | b076d058ba329466edeef8295df9e4ce4956c726 /merge-recursive.c | |
| parent | 971e83528d8c545a4453e7b5cd6dc37fd0e9ebcc (diff) | |
| download | git-e137a892d88cc40d7c0df45c06c08d144f7b3ce2.tar.gz git-e137a892d88cc40d7c0df45c06c08d144f7b3ce2.tar.xz | |
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>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) |