diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-05-01 13:23:39 +0200 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2017-05-01 13:32:51 +0200 |
| commit | deccd843edc9ecda04fae09bb550a90b1ba20632 (patch) | |
| tree | 448f1d653d08bff988aec3778d746c450a7cf7cb /runtime/doc/diff.txt | |
| parent | ac107f7fddc59ef286e3ef3979afe0ea5e94633a (diff) | |
| download | rneovim-deccd843edc9ecda04fae09bb550a90b1ba20632.tar.gz rneovim-deccd843edc9ecda04fae09bb550a90b1ba20632.tar.bz2 rneovim-deccd843edc9ecda04fae09bb550a90b1ba20632.zip | |
vim-patch:3df0173fa6d0
Updated runtime files.
https://github.com/vim/vim/commit/3df0173fa6d0418e89ef4e9c1d04a97c92eec27c
Diffstat (limited to 'runtime/doc/diff.txt')
| -rw-r--r-- | runtime/doc/diff.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt index 12f4563518..e04aa55b5a 100644 --- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -123,6 +123,8 @@ file for a moment and come back to the same file and be in diff mode again. related options only happens in a window that has 'diff' set, if the current window does not have 'diff' set then no options in it are changed. + Hidden buffers are also removed from the list of diff'ed + buffers. The `:diffoff` command resets the relevant options to the values they had when using `:diffsplit`, `:diffpatch` , `:diffthis`. or starting Vim in diff mode. @@ -156,7 +158,8 @@ The alignment of text will go wrong when: All the buffers edited in a window where the 'diff' option is set will join in the diff. This is also possible for hidden buffers. They must have been -edited in a window first for this to be possible. +edited in a window first for this to be possible. To get rid of the hidden +buffers use `:diffoff!`. *:DiffOrig* *diff-original-file* Since 'diff' is a window-local option, it's possible to view the same buffer |