diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-07-10 19:31:35 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-07-10 19:31:35 +0200 |
| commit | 86ae720d7567fcbbe40f00cf136c797953f21038 (patch) | |
| tree | 8a0ce9b2505cfd3bec6df7ef71cb555098d0de68 /runtime/doc/diff.txt | |
| parent | 694cac7a352ea66827cd94ed1ccbc2fc5655e9cc (diff) | |
| download | vim-git-86ae720d7567fcbbe40f00cf136c797953f21038.tar.gz | |
Updated runtime files.
Diffstat (limited to 'runtime/doc/diff.txt')
| -rw-r--r-- | runtime/doc/diff.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt index 492327358..beb0137db 100644 --- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -1,4 +1,4 @@ -*diff.txt* For Vim version 7.4. Last change: 2015 Feb 03 +*diff.txt* For Vim version 7.4. Last change: 2015 Jul 03 VIM REFERENCE MANUAL by Bram Moolenaar @@ -132,8 +132,9 @@ file for a moment and come back to the same file and be in diff mode again. if the current window does not have 'diff' set then no options in it are changed. -The ":diffoff" command resets the relevant options to the values they had when -using |:diffsplit|, |:diffpatch| , |:diffthis|. or starting Vim in diff mode. +The `:diffoff` command resets the relevant options to the values they had when +using `:diffsplit`, `:diffpatch` , `:diffthis`. or starting Vim in diff mode. +When using `:diffoff` twice the last saved values are restored. Otherwise they are set to their default value: 'diff' off |