Mercurial > vim

comparison runtime/doc/diff.txt @ 18594:e9a47bcf7b94

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update runtime files Commit: https://github.com/vim/vim/commit/5ef1c6a4838a9629b793f3ae676f72a764171b00 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Nov 10 22:09:11 2019 +0100 Update runtime files
author Bram Moolenaar <Bram@vim.org>
date Sun, 10 Nov 2019 22:15:04 +0100
parents 2704c4e3e20a
children af69c9335223
comparison
equal deleted inserted replaced
18593:89a359d7bcd2 18594:e9a47bcf7b94
1 *diff.txt* For Vim version 8.1. Last change: 2019 Jul 27 1 *diff.txt* For Vim version 8.1. Last change: 2019 Nov 10
2 2
3 3
4 VIM REFERENCE MANUAL by Bram Moolenaar 4 VIM REFERENCE MANUAL by Bram Moolenaar
5 5
6 6
66 These options are set local to the window. When editing another file they are 66 These options are set local to the window. When editing another file they are
67 reset to the global value. 67 reset to the global value.
68 The options can still be overruled from a modeline when re-editing the file. 68 The options can still be overruled from a modeline when re-editing the file.
69 However, 'foldmethod' and 'wrap' won't be set from a modeline when 'diff' is 69 However, 'foldmethod' and 'wrap' won't be set from a modeline when 'diff' is
70 set. 70 set.
71 See `:diffoff` for an easy way to revert the options.
71 72
72 The differences shown are actually the differences in the buffer. Thus if you 73 The differences shown are actually the differences in the buffer. Thus if you
73 make changes after loading a file, these will be included in the displayed 74 make changes after loading a file, these will be included in the displayed
74 diffs. You might have to do ":diffupdate" now and then, not all changes are 75 diffs. You might have to do ":diffupdate" now and then, not all changes are
75 immediately taken into account. 76 immediately taken into account, especially when using an external diff command.
76 77
77 In your .vimrc file you could do something special when Vim was started in 78 In your .vimrc file you could do something special when Vim was started in
78 diff mode. You could use a construct like this: > 79 diff mode. You could use a construct like this: >
79 80
80 if &diff 81 if &diff