Re: [PATCH 5/5] apply: respect merge.conflictStyle in --3way

Denton Liu [off-list ref] writes:

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 <redacted>
---
 apply.c                   | 2 +-
 t/t4108-apply-threeway.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Interesting.

I do not recall why I did not add this when I introduced the "diff3"
style.  If it were because I knew other parts of "git apply" were
not prepared to see the common ancestor hunk and using the "diff3"
style would have triggered breakage in them, I would remember, so
hopefully there is no subtle and hidden gotchas like it.

The implementation to trigger the "diff3" style conflict
presentation obviously is correct ;-)

Thanks.

 test_apply_with_3way success default true
-test_apply_with_3way failure 'merge.conflictStyle = diff3' 'test_config merge.conflictStyle diff3'
+test_apply_with_3way success 'merge.conflictStyle = diff3' 'test_config merge.conflictStyle diff3'
 
 test_expect_success 'apply with --3way with rerere enabled' '
 	test_config rerere.enabled true &&