summaryrefslogtreecommitdiff
path: root/apply.c
diff options
context:
space:
mode:
authorDenton Liu <liu.denton@gmail.com>2019-10-23 23:32:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-10-24 02:32:53 (GMT)
commit091489d068e0e812123f5114149bdb0e7d74c257 (patch)
treee3a909bb6301b162f455b2bd279caa839f512b2a /apply.c
parentaa76ae4905c28e264f0affc58e36c1db692fa881 (diff)
downloadgit-091489d068e0e812123f5114149bdb0e7d74c257.zip
git-091489d068e0e812123f5114149bdb0e7d74c257.tar.gz
git-091489d068e0e812123f5114149bdb0e7d74c257.tar.bz2
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>
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 cde9536..8470457 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)