Lines Matching refs:in
11 The basics are explained in section |08.7| of the user manual.
22 The easiest way to start editing in diff mode is with the "vimdiff" command.
33 You may also use "viewdiff" or "gviewdiff". Vim starts in readonly mode then.
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.
54 If you always prefer horizontal splits include "horizontal" in 'diffopt'.
73 The differences shown are actually the differences in the buffer. Thus if you
74 make changes after loading a file, these will be included in the displayed
78 In your .vimrc file you could do something special when Vim was started in
87 While already in Vim you can start diff mode in three ways.
100 Use the current buffer, patch it with the diff found in
103 {patchfile} can be in any format that the "patch" program
108 directory to /tmp to avoid files in the current directory
109 accidentally being patched. But it may still result in
118 If you always prefer a vertical split include "vertical" in 'diffopt'.
124 file for a moment and come back to the same file and be in diff mode again.
130 :diffo[ff]! Switch off diff mode for the current window and in all windows
131 in the current tab page where 'diff' is set. Resetting
132 related options only happens in a window that has 'diff' set,
134 in it are changed.
139 using `:diffsplit`, `:diffpatch` , `:diffthis`. or starting Vim in diff mode.
156 text in other windows to be scrolled as well. With vertical splits the text
162 - folds are open in one window but not another
165 - "filler" is not present in 'diffopt', deleted/inserted lines makes the
168 All the buffers edited in a window where the 'diff' option is set will join in
170 edited in a window first for this to be possible. To get rid of the hidden
175 in diff mode in one window and "normal" in another window. It is also
181 (this is in |defaults.vim|). Use ":DiffOrig" to see the differences between
203 Vim will show filler lines for lines that are missing in one window but are
204 present in another. These lines were inserted in another file or deleted in
212 The context of lines above a difference that are not included in the fold can
221 |hl-DiffAdd| DiffAdd Added (inserted) lines. These lines exist in
222 this buffer but not in another.
228 text in between is highlighted. This means
229 that parts in the middle that are still the
233 because they don't really exist in this
260 Otherwise this only works if there is one other buffer in diff
270 buffer in diff mode where 'modifiable' is set this fails.
276 this doesn't work in Visual mode.
281 [count]dp Same as ":diffput" without range. Note: this doesn't work in
292 is on the last line in the buffer and there is no diff above this line, the
295 To be able to get those lines from another buffer in a [range] it's allowed to
312 :diffget Use the other buffer which is in diff mode
314 :diffget v2 Use the buffer which matches "v2" and is in
367 When 'diffexpr' is not empty, Vim evaluates it to obtain a diff file in the
374 Additionally, 'diffexpr' should take care of "icase" and "iwhite" in the
395 binaries isn't useful. The "--binary" argument makes the files read in binary
427 CR in the middle of a line may cause problems, it is seen as a line break.
448 evaluating 'patchexpr'. This hopefully avoids that files in the current
450 v:fname_in and ending in ".rej" and ".orig".