diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-11-10 22:09:11 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-11-10 22:09:11 +0100 |
| commit | 5ef1c6a4838a9629b793f3ae676f72a764171b00 (patch) | |
| tree | f496545a97dd3ce594f7771891c4471700cdcbe9 /runtime/doc/diff.txt | |
| parent | a9aa86ff951b7908b615a61a0e216901b96bc0eb (diff) | |
| download | vim-git-5ef1c6a4838a9629b793f3ae676f72a764171b00.tar.gz | |
Update runtime files
Diffstat (limited to 'runtime/doc/diff.txt')
| -rw-r--r-- | runtime/doc/diff.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt index 8c1f03aa6..6de4bfa62 100644 --- 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: > |