Merge branch 'sg/commit-graph-usage-fix'

[thirdparty/git.git] / apply.c

diff --git a/apply.c b/apply.c
index f8a046a6a5acbd36d14ca85b39e43b19c1d8e9c5..b9291f5f7bf87bf73f95f0490ba3a040507dfc6f 100644 (file)
--- a/apply.c
+++ b/apply.c
@@ -32,7 +32,7 @@ static void git_apply_config(void)
 {
        git_config_get_string_const("apply.whitespace", &apply_default_whitespace);
        git_config_get_string_const("apply.ignorewhitespace", &apply_default_ignorewhitespace);
-       git_config(git_default_config, NULL);
+       git_config(git_xmerge_config, NULL);
 }
 
 static int parse_whitespace_option(struct apply_state *state, const char *option)