diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-04-24 08:57:52 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-04-27 09:21:29 -0400 |
| commit | 6cdb755507e17ae2e5b8096eea9ceae0cbe5d978 (patch) | |
| tree | 9285fc9af135dd06f06f8d86a8cac2d64850e0fb /runtime/doc/diff.txt | |
| parent | d4b65fa6fb330a5a174bdc3a8a838cffa28b0859 (diff) | |
| download | rneovim-6cdb755507e17ae2e5b8096eea9ceae0cbe5d978.tar.gz rneovim-6cdb755507e17ae2e5b8096eea9ceae0cbe5d978.tar.bz2 rneovim-6cdb755507e17ae2e5b8096eea9ceae0cbe5d978.zip | |
vim-patch:5ef1c6a4838a
Update runtime files
https://github.com/vim/vim/commit/5ef1c6a4838a9629b793f3ae676f72a764171b00
"scrollfocus" is for Windows GUI only so it is N/A.
Diffstat (limited to 'runtime/doc/diff.txt')
| -rw-r--r-- | runtime/doc/diff.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt index 3544882ceb..a9e2a0d522 100644 --- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -57,11 +57,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: > |