diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-05-01 15:18:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-01 15:18:34 +0200 |
| commit | a2c2fa68c1077be0a6f026f7cb1aeedeee47e39b (patch) | |
| tree | 0d394eace71c9339cc5de16c419fcc39bb0adcad /runtime/doc/diff.txt | |
| parent | 5d73a6e5dfbd1a7ce27888e7a7ac1c402da9dfc8 (diff) | |
| parent | fa1ee0ac73ab0fbbd246783f42e2df2c2d9280d6 (diff) | |
| download | rneovim-a2c2fa68c1077be0a6f026f7cb1aeedeee47e39b.tar.gz rneovim-a2c2fa68c1077be0a6f026f7cb1aeedeee47e39b.tar.bz2 rneovim-a2c2fa68c1077be0a6f026f7cb1aeedeee47e39b.zip | |
Merge #6625 from justinmk/vim-runtime
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 |