diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2025-02-03 21:52:53 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2025-02-04 08:42:53 +0800 |
| commit | 290bb4c64bdcc475c29b857dc8626f5c51aa2b8d (patch) | |
| tree | af9c68ab653a2cc24dc3d6b6993e0133f9590c50 /runtime/doc/vim_diff.txt | |
| parent | 5a7cf85c2c7e452563a4bce9195e9a3426ca3050 (diff) | |
| download | rneovim-290bb4c64bdcc475c29b857dc8626f5c51aa2b8d.tar.gz rneovim-290bb4c64bdcc475c29b857dc8626f5c51aa2b8d.tar.bz2 rneovim-290bb4c64bdcc475c29b857dc8626f5c51aa2b8d.zip | |
vim-patch:9.1.1009: diff feature can be improved
Problem: diff feature can be improved
Solution: include the linematch diff alignment algorithm
(Jonathon)
closes: vim/vim#9661
https://github.com/vim/vim/commit/7c7a4e6d1ad50d5b25b42aa2d5a33a8d04a4cc8a
Co-authored-by: Jonathon <jonathonwhite@protonmail.com>
Diffstat (limited to 'runtime/doc/vim_diff.txt')
| -rw-r--r-- | runtime/doc/vim_diff.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt index c870de00ef..eae341da49 100644 --- a/runtime/doc/vim_diff.txt +++ b/runtime/doc/vim_diff.txt @@ -351,7 +351,6 @@ Options: - 'autoread' works in the terminal (if it supports "focus" events) - 'background' cannot be set to empty. - 'cpoptions' flags: |cpo-_| -- 'diffopt' "linematch" feature - 'eadirection' cannot be set to empty. - 'exrc' searches for ".nvim.lua", ".nvimrc", or ".exrc" files. The user is prompted whether to trust the file. @@ -466,6 +465,7 @@ Upstreamed features *nvim-upstreamed* These Nvim features were later integrated into Vim. +- 'diffopt' "linematch" feature - 'fillchars' flags: "eob" - 'jumpoptions' "stack" behavior - 'wildoptions' flags: "pum" enables popupmenu for wildmode completion |