apply: respect merge.conflictStyle in --3way
Before, when doing a 3-way merge, the merge.conflictStyle option was not respected and the "merge" style was always used, even if "diff3" was specified. Call git_xmerge_config() at the end of git_apply_config() so that the merge.conflictStyle config is read. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Denton Liu committed
Oct 23, 2019 at 16:32 UTC
091489d068e0e812123f5114149bdb0e7d74c257
2 files changed
+2
-2
apply.c
+1
-1
@@ -32,7 +32,7 @@ static void git_apply_config(void)
32
{
33
git_config_get_string_const("apply.whitespace", &apply_default_whitespace);
34
git_config_get_string_const("apply.ignorewhitespace", &apply_default_ignorewhitespace);
35
- git_config(git_default_config, NULL);
35
+ git_config(git_xmerge_config, NULL);
36
}
37
38
static int parse_whitespace_option(struct apply_state *state, const char *option)
t/t4108-apply-threeway.sh
+1
-1
@@ -73,7 +73,7 @@ test_expect_success 'apply with --3way' '
73
test_apply_with_3way
74
'
75
76
-test_expect_failure 'apply with --3way with merge.conflictStyle = diff3' '
76
+test_expect_success 'apply with --3way with merge.conflictStyle = diff3' '
77
test_config merge.conflictStyle diff3 &&
78
test_apply_with_3way
79
'