Mercurial > vim
diff runtime/doc/diff.txt @ 7228:873eae260c97
commit https://github.com/vim/vim/commit/b4ff518d95aa57c2f8c0568c915035bef849581b
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Nov 10 21:15:48 2015 +0100
Updated runtime files.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 10 Nov 2015 21:30:05 +0100 |
| parents | 2def7b25de60 |
| children | f52b263fb3f0 |
line wrap: on
line diff
--- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -1,4 +1,4 @@ -*diff.txt* For Vim version 7.4. Last change: 2015 Jul 03 +*diff.txt* For Vim version 7.4. Last change: 2015 Nov 01 VIM REFERENCE MANUAL by Bram Moolenaar @@ -182,8 +182,8 @@ hidden buffers. You can use ":hide" to buffer. If you don't want a buffer to remain used for the diff do ":set nodiff" before hiding it. - *:diffu* *:diffupdate* -:diffu[pdate][!] Update the diff highlighting and folds. + *:dif* *:diffupdate* +:dif[fupdate][!] Update the diff highlighting and folds. Vim attempts to keep the differences updated when you make changes to the text. This mostly takes care of inserted and deleted lines. Changes within a