diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-04-10 01:43:07 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-04-10 01:43:07 -0400 |
| commit | 1bf1ffc7346c0cc8e8ef337fd94badd3a530e90e (patch) | |
| tree | 5794dcd00d9d1198fbbb1c6e60739bc6b335283d /runtime/doc/diff.txt | |
| parent | bf2c2b34cf2314a03236c692b02778eb964dcccb (diff) | |
| parent | beccc3e3a132a401c800e77785f52cb0683bd859 (diff) | |
| download | rneovim-1bf1ffc7346c0cc8e8ef337fd94badd3a530e90e.tar.gz rneovim-1bf1ffc7346c0cc8e8ef337fd94badd3a530e90e.tar.bz2 rneovim-1bf1ffc7346c0cc8e8ef337fd94badd3a530e90e.zip | |
Merge pull request #4505 from watiko/vim-runtimes
vim-patch:86ae720,f913281,dd1616e
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 |