Mercurial > vim

comparison runtime/doc/diff.txt @ 674:4b8583e82cb8 v7.0201

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.0201
author vimboss
date Sat, 18 Feb 2006 22:14:51 +0000
parents c79d4df4686e
children d591d4ceeaee
comparison
equal deleted inserted replaced
673:513866ffe6af 674:4b8583e82cb8
1 *diff.txt* For Vim version 7.0aa. Last change: 2006 Jan 22 1 *diff.txt* For Vim version 7.0aa. Last change: 2006 Feb 18
2 2
3 3
4 VIM REFERENCE MANUAL by Bram Moolenaar 4 VIM REFERENCE MANUAL by Bram Moolenaar
5 5
6 6
38 The second and following arguments may also be a directory name. Vim will 38 The second and following arguments may also be a directory name. Vim will
39 then append the file name of the first argument to the directory name to find 39 then append the file name of the first argument to the directory name to find
40 the file. 40 the file.
41 41
42 This only works when a standard "diff" command is available. See 'diffexpr'. 42 This only works when a standard "diff" command is available. See 'diffexpr'.
43
44 Diffs are local to the current tab page |tab-page|. You can't see diffs with
45 a window in another tab page. This does make it possible to have several
46 diffs at the same time, each in their own tab page.
43 47
44 What happens is that Vim opens a window for each of the files. This is like 48 What happens is that Vim opens a window for each of the files. This is like
45 using the |-O| argument. This uses vertical splits. If you prefer horizontal 49 using the |-O| argument. This uses vertical splits. If you prefer horizontal
46 splits add the |-o| argument: > 50 splits add the |-o| argument: >
47 51
111 file for a moment and come back to the same file and be in diff mode again. 115 file for a moment and come back to the same file and be in diff mode again.
112 116
113 *:diffo* *:diffoff* 117 *:diffo* *:diffoff*
114 :diffoff Switch off diff mode for the current window. 118 :diffoff Switch off diff mode for the current window.
115 119
116 :diffoff! Switch off diff mode for all windows. 120 :diffoff! Switch off diff mode for all windows in the current tab page.
117 121
118 The ":diffoff" command resets the relevant options to their default value. 122 The ":diffoff" command resets the relevant options to their default value.
119 This may be different from what the values were before diff mode was started, 123 This may be different from what the values were before diff mode was started,
120 the old values are not remembered. 124 the old values are not remembered.
121 125