diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2025-03-29 07:01:49 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-29 07:01:49 +0800 |
| commit | cb31663663b9be92dd9c2fbe06ccea88625b2fca (patch) | |
| tree | 812b56ede3741de74443099815e5eac4c2ff8988 /runtime/doc/diff.txt | |
| parent | f4ee0ab2f1a15fe3bb88122fa162620e4af74b1d (diff) | |
| download | rneovim-cb31663663b9be92dd9c2fbe06ccea88625b2fca.tar.gz rneovim-cb31663663b9be92dd9c2fbe06ccea88625b2fca.tar.bz2 rneovim-cb31663663b9be92dd9c2fbe06ccea88625b2fca.zip | |
vim-patch:9.1.1252: typos in code and docs related to 'diffopt' "inline:" (#33143)
Problem: Typos in code and docs related to 'diffopt' "inline:".
(after v9.1.1243)
Solution: Fix typos and slightly improve the docs.
(zeertzjq)
closes: vim/vim#16997
https://github.com/vim/vim/commit/5a307c361cbe9f7ac438a917b905378d87f8f2de
Diffstat (limited to 'runtime/doc/diff.txt')
| -rw-r--r-- | runtime/doc/diff.txt | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt index 2c2565985a..f39a51022a 100644 --- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -231,12 +231,11 @@ The diffs are highlighted with these groups: highlight the exact difference between the two. Will respect any 'diffopt' flag that affects internal diff. - Not used when `inline:` set to "none". -|hl-DiffTextAdd| DiffTextAdd Added text inside a Changed line. Similar to + Not used when `inline:` is set to "none". +|hl-DiffTextAdd| DiffTextAdd Added text inside a Changed line. Similar to DiffText, but used when there is no - corresponding text in other buffers. Will not - be used when `inline:` is set to "simple" or - "none". + corresponding text in other buffers. Not used + when `inline:` is set to "simple" or "none". |hl-DiffDelete| DiffDelete Deleted lines. Also called filler lines, because they don't really exist in this buffer. |