Mercurial > vim
diff runtime/doc/diff.txt @ 10895:c391bfbdb452
Updated runtime files.
commit https://github.com/vim/vim/commit/3df0173fa6d0418e89ef4e9c1d04a97c92eec27c
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Feb 17 22:47:16 2017 +0100
Updated runtime files.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Fri, 17 Feb 2017 23:00:06 +0100 |
| parents | 9f48eab77d62 |
| children | d91cf2e26ef0 |
line wrap: on
line diff
--- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -1,4 +1,4 @@ -*diff.txt* For Vim version 8.0. Last change: 2016 Aug 24 +*diff.txt* For Vim version 8.0. Last change: 2017 Feb 03 VIM REFERENCE MANUAL by Bram Moolenaar @@ -131,6 +131,8 @@ file for a moment and come back to the s 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. @@ -164,7 +166,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