Mercurial > vim

comparison runtime/doc/diff.txt @ 12499:d91cf2e26ef0

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/37c64c78fd87e086b5a945ad7032787c274e2dcb Author: Bram Moolenaar <Bram@vim.org> Date: Tue Sep 19 22:06:03 2017 +0200 Update runtime files.
author Christian Brabandt <cb@256bit.org>
date Tue, 19 Sep 2017 22:15:06 +0200
parents c391bfbdb452
children 34c8ec888122
comparison
equal deleted inserted replaced
12498:bf98d339b568 12499:d91cf2e26ef0
1 *diff.txt* For Vim version 8.0. Last change: 2017 Feb 03 1 *diff.txt* For Vim version 8.0. Last change: 2017 Sep 02
2 2
3 3
4 VIM REFERENCE MANUAL by Bram Moolenaar 4 VIM REFERENCE MANUAL by Bram Moolenaar
5 5
6 6
224 finds the first character that is different, 224 finds the first character that is different,
225 and the last character that is different 225 and the last character that is different
226 (searching from the end of the line). The 226 (searching from the end of the line). The
227 text in between is highlighted. This means 227 text in between is highlighted. This means
228 that parts in the middle that are still the 228 that parts in the middle that are still the
229 same are highlighted anyway. Only "iwhite" of 229 same are highlighted anyway. The 'diffopt'
230 'diffopt' is used here. 230 flags "iwhite" and "icase" are used here.
231 |hl-DiffDelete| DiffDelete Deleted lines. Also called filler lines, 231 |hl-DiffDelete| DiffDelete Deleted lines. Also called filler lines,
232 because they don't really exist in this 232 because they don't really exist in this
233 buffer. 233 buffer.
234 234
235 ============================================================================== 235 ==============================================================================