diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-08-29 10:59:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-30 19:41:44 -0700 |
| commit | c236bcd06138bcbc929b86ad1a513635bf4847b2 (patch) | |
| tree | 4e1b02387bf93c73b7fc487aa417cb0ae1170d57 /builtin-merge-recursive.c | |
| parent | b541248467fa47979a34e3f1c5bbe3308fbdc4d1 (diff) | |
| download | git-c236bcd06138bcbc929b86ad1a513635bf4847b2.tar.gz | |
git-merge-recursive: learn to honor merge.conflictstyle
This teaches the low-level ll_xdl_merge() routine to honor
merge.conflictstyle configuration variable, so that merge-recursive
strategy can show the conflicts in the style of user's choice.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-recursive.c')
| -rw-r--r-- | builtin-merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-merge-recursive.c b/builtin-merge-recursive.c index 43e55bf901..c4349d4697 100644 --- a/builtin-merge-recursive.c +++ b/builtin-merge-recursive.c @@ -1348,7 +1348,7 @@ static int merge_config(const char *var, const char *value, void *cb) merge_rename_limit = git_config_int(var, value); return 0; } - return git_default_config(var, value, cb); + return git_xmerge_config(var, value, cb); } int cmd_merge_recursive(int argc, const char **argv, const char *prefix) |