Mercurial > vim

comparison runtime/doc/diff.txt @ 10895:c391bfbdb452

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated runtime files. commit https://github.com/vim/vim/commit/3df0173fa6d0418e89ef4e9c1d04a97c92eec27c Author: Bram Moolenaar <Bram@vim.org> Date: Fri Feb 17 22:47:16 2017 +0100 Updated runtime files.
author Christian Brabandt <cb@256bit.org>
date Fri, 17 Feb 2017 23:00:06 +0100
parents 9f48eab77d62
children d91cf2e26ef0
comparison
equal deleted inserted replaced
10894:f1cb20e3550e 10895:c391bfbdb452
1 *diff.txt* For Vim version 8.0. Last change: 2016 Aug 24 1 *diff.txt* For Vim version 8.0. Last change: 2017 Feb 03
2 2
3 3
4 VIM REFERENCE MANUAL by Bram Moolenaar 4 VIM REFERENCE MANUAL by Bram Moolenaar
5 5
6 6
129 :diffo[ff]! Switch off diff mode for the current window and in all windows 129 :diffo[ff]! Switch off diff mode for the current window and in all windows
130 in the current tab page where 'diff' is set. Resetting 130 in the current tab page where 'diff' is set. Resetting
131 related options only happens in a window that has 'diff' set, 131 related options only happens in a window that has 'diff' set,
132 if the current window does not have 'diff' set then no options 132 if the current window does not have 'diff' set then no options
133 in it are changed. 133 in it are changed.
134 Hidden buffers are also removed from the list of diff'ed
135 buffers.
134 136
135 The `:diffoff` command resets the relevant options to the values they had when 137 The `:diffoff` command resets the relevant options to the values they had when
136 using `:diffsplit`, `:diffpatch` , `:diffthis`. or starting Vim in diff mode. 138 using `:diffsplit`, `:diffpatch` , `:diffthis`. or starting Vim in diff mode.
137 When using `:diffoff` twice the last saved values are restored. 139 When using `:diffoff` twice the last saved values are restored.
138 Otherwise they are set to their default value: 140 Otherwise they are set to their default value:
162 - "filler" is not present in 'diffopt', deleted/inserted lines makes the 164 - "filler" is not present in 'diffopt', deleted/inserted lines makes the
163 alignment go wrong 165 alignment go wrong
164 166
165 All the buffers edited in a window where the 'diff' option is set will join in 167 All the buffers edited in a window where the 'diff' option is set will join in
166 the diff. This is also possible for hidden buffers. They must have been 168 the diff. This is also possible for hidden buffers. They must have been
167 edited in a window first for this to be possible. 169 edited in a window first for this to be possible. To get rid of the hidden
170 buffers use `:diffoff!`.
168 171
169 *:DiffOrig* *diff-original-file* 172 *:DiffOrig* *diff-original-file*
170 Since 'diff' is a window-local option, it's possible to view the same buffer 173 Since 'diff' is a window-local option, it's possible to view the same buffer
171 in diff mode in one window and "normal" in another window. It is also 174 in diff mode in one window and "normal" in another window. It is also
172 possible to view the changes you have made to a buffer since the file was 175 possible to view the changes you have made to a buffer since the file was