diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2025-02-04 09:13:51 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-04 09:13:51 +0800 |
| commit | 40edfb0af0d71c12636a2aaf5c382e1b4daec9cd (patch) | |
| tree | 74a37686787a876908663aac00bd066dab011355 /runtime/doc/vim_diff.txt | |
| parent | 5a7cf85c2c7e452563a4bce9195e9a3426ca3050 (diff) | |
| parent | 3a1fe4732d8b6efd5b10803e649d62dc17c2c778 (diff) | |
| download | rneovim-40edfb0af0d71c12636a2aaf5c382e1b4daec9cd.tar.gz rneovim-40edfb0af0d71c12636a2aaf5c382e1b4daec9cd.tar.bz2 rneovim-40edfb0af0d71c12636a2aaf5c382e1b4daec9cd.zip | |
Merge pull request #32315 from zeertzjq/vim-9.1.1009
vim-patch:9.1.{1009,1022,1023,1027,1072}
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 |