diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2025-01-16 09:16:25 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-16 01:16:25 +0000 |
| commit | 718e16536052c0e75de61a32ef237a9e87fc03f2 (patch) | |
| tree | cecd930e599260b75d87d508f721e2c6c7663cbd /test/old | |
| parent | 524be56042335db589b9fe62dfdae39be3f69a15 (diff) | |
| download | rneovim-718e16536052c0e75de61a32ef237a9e87fc03f2.tar.gz rneovim-718e16536052c0e75de61a32ef237a9e87fc03f2.tar.bz2 rneovim-718e16536052c0e75de61a32ef237a9e87fc03f2.zip | |
vim-patch:9.1.1018: v9.1.0743 causes regression with diff mode (#32047)
Problem: v9.1.0743 causes regression with diff mode
Solution: Fix the regression with overlapping regions
closes: vim/vim#16454
https://github.com/vim/vim/commit/01f6509fb2de1627cc4ec2c109cd0aa2e3346d50
Co-authored-by: Yukihiro Nakadaira <yukihiro.nakadaira@gmail.com>
Diffstat (limited to 'test/old')
| -rw-r--r-- | test/old/testdir/test_diffmode.vim | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/test/old/testdir/test_diffmode.vim b/test/old/testdir/test_diffmode.vim index 880286d329..695aeeac75 100644 --- a/test/old/testdir/test_diffmode.vim +++ b/test/old/testdir/test_diffmode.vim @@ -2004,6 +2004,12 @@ func Test_diff_overlapped_diff_blocks_will_be_merged() 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", "") + call StopVimInTerminal(buf) endfunc |