thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.1.1018: v9.1.0743 causes regression with diff mode

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

closes: #16454

Signed-off-by: Yukihiro Nakadaira <yukihiro.nakadaira@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Yukihiro Nakadaira
2025-01-15 18:36:43 +01:00
committed by Christian Brabandt
parent 6472e58365
commit 01f6509fb2
5 changed files with 58 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/testdir/test_diffmode.vim
View File

@@ -2290,6 +2290,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", "")