Mercurial > vim
diff runtime/doc/diff.txt @ 18594:e9a47bcf7b94
Update runtime files
Commit: https://github.com/vim/vim/commit/5ef1c6a4838a9629b793f3ae676f72a764171b00
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Nov 10 22:09:11 2019 +0100
Update runtime files
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 10 Nov 2019 22:15:04 +0100 |
| parents | 2704c4e3e20a |
| children | af69c9335223 |
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.1. Last change: 2019 Jul 27 +*diff.txt* For Vim version 8.1. Last change: 2019 Nov 10 VIM REFERENCE MANUAL by Bram Moolenaar @@ -68,11 +68,12 @@ reset to the global value. The options can still be overruled from a modeline when re-editing the file. However, 'foldmethod' and 'wrap' won't be set from a modeline when 'diff' is set. +See `:diffoff` for an easy way to revert the options. The differences shown are actually the differences in the buffer. Thus if you make changes after loading a file, these will be included in the displayed diffs. You might have to do ":diffupdate" now and then, not all changes are -immediately taken into account. +immediately taken into account, especially when using an external diff command. In your .vimrc file you could do something special when Vim was started in diff mode. You could use a construct like this: >