Currently both merge.conflictStyle and --conflict=diff3 don't work together for `git commit --merge`, since the former wrongly overrides the later. There is no easy way to fix this, so mark it as broken for now. Signee-off-by: Felipe Contreras <felipe.contreras@xxxxxxxxx> --- t/t6440-config-conflict-markers.sh | 31 ++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/t/t6440-config-conflict-markers.sh b/t/t6440-config-conflict-markers.sh index c51512ced6..3ba993a6a8 100755 --- a/t/t6440-config-conflict-markers.sh +++ b/t/t6440-config-conflict-markers.sh @@ -82,4 +82,35 @@ test_expect_success 'notes' ' ) ' +test_expect_failure 'checkout' ' + test_create_repo checkout && + ( + test_commit checkout && + + test_write_lines a b c d e >content && + git add content && + git commit -m initial && + + git checkout -b simple master && + test_write_lines a c e >content && + git commit -a -m simple && + + test_write_lines b d >content && + git checkout --merge master && + ! grep "^|||||||" content && + + git config merge.conflictstyle merge && + + git checkout -f simple && + test_write_lines b d >content && + git checkout --merge --conflict=diff3 master && + grep "^|||||||" content && + + git checkout -f simple && + test_write_lines b d >content && + git checkout --merge --conflict=merge master && + ! grep "^|||||||" content + ) +' + test_done -- 2.40.0+fc1
