diff options
| author |  Denton Liu <liu.denton@gmail.com> | 2019-10-23 16:32:38 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-10-24 11:32:53 +0900 |
| commit | 091489d068e0e812123f5114149bdb0e7d74c257 (patch) | |
| tree | e3a909bb6301b162f455b2bd279caa839f512b2a /t/t4013/diff.diff_--no-index_--raw_--no-abbrev_dir2_dir | |
| parent | t4108: demonstrate bug in apply (diff) | |
| download | tgif-091489d068e0e812123f5114149bdb0e7d74c257.tar.xz | |
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 't/t4013/diff.diff_--no-index_--raw_--no-abbrev_dir2_dir')
0 files changed, 0 insertions, 0 deletions