diff options
| author | Bram Moolenaar <Bram@vim.org> | 2012-05-18 18:47:17 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2012-05-18 18:47:17 +0200 |
| commit | bd1d5608952dd1c61f99f9b2f605610405415622 (patch) | |
| tree | 20c04b0c33df0d916164a1193c6db3a3419d11ed /runtime/doc/diff.txt | |
| parent | 455981e69bcef65ef96ecf6b0a27810b585fc9d9 (diff) | |
| download | vim-bd1d5608952dd1c61f99f9b2f605610405415622.zip | |
updated for version 7.3.523
Problem: ":diffupdate" doesn't check for files changed elsewhere.
Solution: Add the ! flag. (Christian Brabandt)
Diffstat (limited to 'runtime/doc/diff.txt')
| -rw-r--r-- | runtime/doc/diff.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt index 288ddd78a..bf40afa88 100644 --- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -178,7 +178,7 @@ 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. +:diffu[pdate][!] 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 @@ -187,6 +187,9 @@ To force the differences to be updated use: > :diffupdate +If the ! is included Vim will check if the file was changed externally and +needs to be reloaded. It will prompt for each changed file, like `:checktime` +was used. Vim will show filler lines for lines that are missing in one window but are present in another. These lines were inserted in another file or deleted in |