diff options
| author | Bram Moolenaar <Bram@vim.org> | 2006-02-18 22:14:51 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2006-02-18 22:14:51 +0000 |
| commit | 7e8fd63682801d6cdd7f31972540c21f148b289e (patch) | |
| tree | cbc44d7f10ef0a87454582fbff40fe930bacc6b6 /runtime/doc/diff.txt | |
| parent | 997fb4ba696625e27e17c00d5033b20411aa45a3 (diff) | |
| download | vim-git-7e8fd63682801d6cdd7f31972540c21f148b289e.tar.gz | |
updated for version 7.0201v7.0201
Diffstat (limited to 'runtime/doc/diff.txt')
| -rw-r--r-- | runtime/doc/diff.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt index b39e721c1..aaf21b0f3 100644 --- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -1,4 +1,4 @@ -*diff.txt* For Vim version 7.0aa. Last change: 2006 Jan 22 +*diff.txt* For Vim version 7.0aa. Last change: 2006 Feb 18 VIM REFERENCE MANUAL by Bram Moolenaar @@ -41,6 +41,10 @@ the file. This only works when a standard "diff" command is available. See 'diffexpr'. +Diffs are local to the current tab page |tab-page|. You can't see diffs with +a window in another tab page. This does make it possible to have several +diffs at the same time, each in their own tab page. + What happens is that Vim opens a window for each of the files. This is like using the |-O| argument. This uses vertical splits. If you prefer horizontal splits add the |-o| argument: > @@ -113,7 +117,7 @@ file for a moment and come back to the same file and be in diff mode again. *:diffo* *:diffoff* :diffoff Switch off diff mode for the current window. -:diffoff! Switch off diff mode for all windows. +:diffoff! Switch off diff mode for all windows in the current tab page. The ":diffoff" command resets the relevant options to their default value. This may be different from what the values were before diff mode was started, |