Mercurial > vim

comparison runtime/doc/diff.txt @ 6336:4abac79c0b7a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update runtime files.
author Bram Moolenaar <bram@vim.org>
date Wed, 05 Nov 2014 17:02:17 +0100
parents 16d26051085a
children b0a227941705
comparison
equal deleted inserted replaced
6335:11fad096bd54 6336:4abac79c0b7a
1 *diff.txt* For Vim version 7.4. Last change: 2014 May 20 1 *diff.txt* For Vim version 7.4. Last change: 2014 Oct 31
2 2
3 3
4 VIM REFERENCE MANUAL by Bram Moolenaar 4 VIM REFERENCE MANUAL by Bram Moolenaar
5 5
6 6
264 When [bufspec] is omitted and there is more than one other 264 When [bufspec] is omitted and there is more than one other
265 buffer in diff mode where 'modifiable' is set this fails. 265 buffer in diff mode where 'modifiable' is set this fails.
266 See below for [range]. 266 See below for [range].
267 267
268 *do* 268 *do*
269 do Same as ":diffget" without argument or range. The "o" stands 269 [count]do Same as ":diffget" without range. The "o" stands for "obtain"
270 for "obtain" ("dg" can't be used, it could be the start of 270 ("dg" can't be used, it could be the start of "dgg"!). Note:
271 "dgg"!). Note: this doesn't work in Visual mode. 271 this doesn't work in Visual mode.
272 If you give a [count], it is used as the [bufspec] argument
273 for ":diffget".
272 274
273 *dp* 275 *dp*
274 dp Same as ":diffput" without argument or range. 276 [count]dp Same as ":diffput" without range. Note: this doesn't work in
275 Note: this doesn't work in Visual mode. 277 Visual mode.
278 If you give a [count], it is used as the [bufspec] argument
279 for ":diffput".
276 280
277 281
278 When no [range] is given, the diff at the cursor position or just above it is 282 When no [range] is given, the diff at the cursor position or just above it is
279 affected. When [range] is used, Vim tries to only put or get the specified 283 affected. When [range] is used, Vim tries to only put or get the specified
280 lines. When there are deleted lines, this may not always be possible. 284 lines. When there are deleted lines, this may not always be possible.