Mercurial > vim

comparison runtime/doc/diff.txt @ 3830:04592728474a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated runtime files.
author Bram Moolenaar <bram@vim.org>
date Fri, 21 Sep 2012 14:54:30 +0200
parents 536aa8b0c934
children 058f26a834c4
comparison
equal deleted inserted replaced
3829:25f9e59741f9 3830:04592728474a
1 *diff.txt* For Vim version 7.3. Last change: 2012 Aug 08 1 *diff.txt* For Vim version 7.3. Last change: 2012 Sep 05
2 2
3 3
4 VIM REFERENCE MANUAL by Bram Moolenaar 4 VIM REFERENCE MANUAL by Bram Moolenaar
5 5
6 6
84 endif 84 endif
85 85
86 While already in Vim you can start diff mode in three ways. 86 While already in Vim you can start diff mode in three ways.
87 87
88 *E98* 88 *E98*
89 :diffsplit {filename} *:diffs* *:diffsplit* 89 :diffs[plit] {filename} *:diffs* *:diffsplit*
90 Open a new window on the file {filename}. The options are set 90 Open a new window on the file {filename}. The options are set
91 as for "vimdiff" for the current and the newly opened window. 91 as for "vimdiff" for the current and the newly opened window.
92 Also see 'diffexpr'. 92 Also see 'diffexpr'.
93 93
94 *:difft* *:diffthis* 94 *:difft* *:diffthis*
95 :diffthis Make the current window part of the diff windows. This sets 95 :difft[his] Make the current window part of the diff windows. This sets
96 the options like for "vimdiff". 96 the options like for "vimdiff".
97 97
98 :diffpatch {patchfile} *E816* *:diffp* *:diffpatch* 98 :diffp[atch] {patchfile} *E816* *:diffp* *:diffpatch*
99 Use the current buffer, patch it with the diff found in 99 Use the current buffer, patch it with the diff found in
100 {patchfile} and open a buffer on the result. The options are 100 {patchfile} and open a buffer on the result. The options are
101 set as for "vimdiff". 101 set as for "vimdiff".
102 {patchfile} can be in any format that the "patch" program 102 {patchfile} can be in any format that the "patch" program
103 understands or 'patchexpr' can handle. 103 understands or 'patchexpr' can handle.
121 121
122 Since the option values are remembered with the buffer, you can edit another 122 Since the option values are remembered with the buffer, you can edit another
123 file for a moment and come back to the same file and be in diff mode again. 123 file for a moment and come back to the same file and be in diff mode again.
124 124
125 *:diffo* *:diffoff* 125 *:diffo* *:diffoff*
126 :diffoff Switch off diff mode for the current window. 126 :diffo[ff] Switch off diff mode for the current window.
127 127
128 :diffoff! Switch off diff mode for the current window and in all windows 128 :diffo[ff]! Switch off diff mode for the current window and in all windows
129 in the current tab page where 'diff' is set. 129 in the current tab page where 'diff' is set.
130 130
131 The ":diffoff" command resets the relevant options to their default value. 131 The ":diffoff" command resets the relevant options to their default value.
132 This may be different from what the values were before diff mode was started, 132 This may be different from what the values were before diff mode was started,
133 the old values are not remembered. 133 the old values are not remembered.