1
- *diff.txt* For Vim version 8.0 . Last change: 2017 Feb 03
1
+ *diff.txt* For Vim version 8.1 . Last change: 2017 Oct 03
2
2
3
3
4
4
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -10,7 +10,7 @@ eight versions of the same file.
10
10
11
11
The basics are explained in section | 08.7 | of the user manual.
12
12
13
- 1. Starting diff mode | vimdiff |
13
+ 1. Starting diff mode | start- vimdiff|
14
14
2. Viewing diffs | view-diffs |
15
15
3. Jumping to diffs | jumpto-diffs |
16
16
4. Copying diffs | copy-diffs |
@@ -19,7 +19,7 @@ The basics are explained in section |08.7| of the user manual.
19
19
{not in Vi}
20
20
21
21
==============================================================================
22
- 1. Starting diff mode
22
+ 1. Starting diff mode *start-vimdiff*
23
23
24
24
The easiest way to start editing in diff mode is with the "vimdiff" command.
25
25
This starts Vim as usual, and additionally sets up for viewing the differences
@@ -226,8 +226,8 @@ The diffs are highlighted with these groups:
226
226
(searching from the end of the line). The
227
227
text in between is highlighted. This means
228
228
that parts in the middle that are still the
229
- same are highlighted anyway. Only "iwhite" of
230
- 'diffopt' is used here.
229
+ same are highlighted anyway. The 'diffopt'
230
+ flags "iwhite" and "icase" are used here.
231
231
| hl-DiffDelete | DiffDelete Deleted lines. Also called filler lines,
232
232
because they don't really exist in this
233
233
buffer.
@@ -326,7 +326,7 @@ g:diff_translations to zero: >
326
326
327
327
let g:diff_translations = 0
328
328
<
329
- After setting this variable, Reload the syntax script: >
329
+ After setting this variable, reload the syntax script: >
330
330
331
331
set syntax=diff
332
332
<
0 commit comments