summaryrefslogtreecommitdiff
path: root/apply.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-11-10 09:02:15 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-11-10 09:02:15 (GMT)
commiteff313f8a7ff64cb3097d185c55f5ce7271f4ee9 (patch)
treea33a22e1d92e607654fb64fb3ab04ffd1786b4cd /apply.c
parentdb806d7064ee132c2dbb3d36d26da9adb5066260 (diff)
parent091489d068e0e812123f5114149bdb0e7d74c257 (diff)
downloadgit-eff313f8a7ff64cb3097d185c55f5ce7271f4ee9.zip
git-eff313f8a7ff64cb3097d185c55f5ce7271f4ee9.tar.gz
git-eff313f8a7ff64cb3097d185c55f5ce7271f4ee9.tar.bz2
Merge branch 'dl/apply-3way-diff3'
"git apply --3way" learned to honor merge.conflictStyle configuration variable, like merges would. * dl/apply-3way-diff3: apply: respect merge.conflictStyle in --3way t4108: demonstrate bug in apply t4108: use `test_config` instead of `git config` t4108: remove git command upstream of pipe t4108: replace create_file with test_write_lines
Diffstat (limited to 'apply.c')
-rw-r--r--apply.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/apply.c b/apply.c
index f8a046a..b9291f5 100644
--- 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)