mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-04-05 07:09:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.1018: v9.1.0743 causes regression with diff mode (#32047)

Browse Source 
Problem:  v9.1.0743 causes regression with diff mode
Solution: Fix the regression with overlapping regions

closes: vim/vim#16454

01f6509fb2

Co-authored-by: Yukihiro Nakadaira <yukihiro.nakadaira@gmail.com>
This commit is contained in:
zeertzjq
2025-01-16 09:16:25 +08:00
committed by GitHub
parent 524be56042
commit 718e165360
3 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/old/testdir/test_diffmode.vim
View File

@@ -2004,6 +2004,12 @@ func Test_diff_overlapped_diff_blocks_will_be_merged()
call WriteDiffFiles3(buf, ["a", "b", "c"], ["a", "x", "c"], ["a", "y", "b", "c"])
call VerifyBoth(buf, "Test_diff_overlapped_3.36", "")
call WriteDiffFiles3(buf, ["a", "b", "c"], ["a", "x", "c"], ["a", "b", "y", "c"])
call VerifyBoth(buf, "Test_diff_overlapped_3.37", "")
call WriteDiffFiles3(buf, ["a", "b", "c"], ["d", "e"], ["b", "f"])
call VerifyBoth(buf, "Test_diff_overlapped_3.38", "")
call WriteDiffFiles3(buf, ["a", "b", "c"], ["d", "e"], ["b"])
call VerifyBoth(buf, "Test_diff_overlapped_3.39", "")