tree e3a909bb6301b162f455b2bd279caa839f512b2a
parent aa76ae4905c28e264f0affc58e36c1db692fa881
author Denton Liu <liu.denton@gmail.com> 1571873558 -0700
committer Junio C Hamano <gitster@pobox.com> 1571884373 +0900

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>