aboutsummaryrefslogtreecommitdiff
path: root/runtime/doc/diff.txt
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2017-11-07 19:34:37 +0100
committerJustin M. Keyes <justinkz@gmail.com>2017-11-07 20:03:24 +0100
commit8c6168565cb5dade92f9da51c1c9e96882029eaa (patch)
treec6734e0d30bd065c32a2b0d1ab6a531b127c885f /runtime/doc/diff.txt
parentae569ea57b1df1b450803b6d23ab8c315dd72e72 (diff)
downloadrneovim-8c6168565cb5dade92f9da51c1c9e96882029eaa.tar.gz
rneovim-8c6168565cb5dade92f9da51c1c9e96882029eaa.tar.bz2
rneovim-8c6168565cb5dade92f9da51c1c9e96882029eaa.zip
vim-patch:37c64c78fd87
Note: Ignored changes to matchit.vim in favor of faca81411628. --- Update runtime files. https://github.com/vim/vim/commit/37c64c78fd87e086b5a945ad7032787c274e2dcb
Diffstat (limited to 'runtime/doc/diff.txt')
-rw-r--r--runtime/doc/diff.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt
index 8cb049584a..ebf47ae467 100644
--- a/runtime/doc/diff.txt
+++ b/runtime/doc/diff.txt
@@ -214,8 +214,8 @@ The diffs are highlighted with these groups:
(searching from the end of the line). The
text in between is highlighted. This means
that parts in the middle that are still the
- same are highlighted anyway. Only "iwhite" of
- 'diffopt' is used here.
+ same are highlighted anyway. The 'diffopt'
+ flags "iwhite" and "icase" are used here.
|hl-DiffDelete| DiffDelete Deleted lines. Also called filler lines,
because they don't really exist in this
buffer.