diff options
| author | watiko <service@mail.watiko.net> | 2016-03-04 08:11:00 +0900 |
|---|---|---|
| committer | watiko <service@mail.watiko.net> | 2016-03-29 21:41:37 +0900 |
| commit | ce832238c85fe8fef2250ac4ec567d4a8d302537 (patch) | |
| tree | 35099a31a5361858d2a147b5c4ef0d9953a58ee1 /runtime/doc/diff.txt | |
| parent | ae686092f807adbbb578b8ae2c2200654f9df8c1 (diff) | |
| download | rneovim-ce832238c85fe8fef2250ac4ec567d4a8d302537.tar.gz rneovim-ce832238c85fe8fef2250ac4ec567d4a8d302537.tar.bz2 rneovim-ce832238c85fe8fef2250ac4ec567d4a8d302537.zip | |
vim-patch:86ae720
Updated runtime files.
https://github.com/vim/vim/commit/86ae720d7567fcbbe40f00cf136c797953f21038
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 8c9cdc3800..77603b1e58 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 @@ -124,8 +124,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 |