diff options
| author | Bram Moolenaar <Bram@vim.org> | 2010-09-30 21:47:56 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2010-09-30 21:47:56 +0200 |
| commit | 4a74803ef837eeb4d4fc799ac9a26fc93e584111 (patch) | |
| tree | 49d3d0a083a47078ae42a3b353a691e005d71ab6 /runtime/doc/diff.txt | |
| parent | c2a406b3179af3a77fb059288ead7266cdce2ac8 (diff) | |
Runtime file updates.
Diffstat (limited to 'runtime/doc/diff.txt')
| -rw-r--r-- | runtime/doc/diff.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt index 1d62e545c4..becbeb3627 100644 --- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -1,4 +1,4 @@ -*diff.txt* For Vim version 7.3. Last change: 2010 Jul 31 +*diff.txt* For Vim version 7.3. Last change: 2010 Sep 30 VIM REFERENCE MANUAL by Bram Moolenaar @@ -261,10 +261,12 @@ that the buffers will be equal within the specified range. *do* do Same as ":diffget" without argument or range. The "o" stands for "obtain" ("dg" can't be used, it could be the start of - "dgg"!). + "dgg"!). Note: this doesn't work in Visual mode. *dp* dp Same as ":diffput" without argument or range. + Note: this doesn't work in Visual mode. + When no [range] is given, the diff at the cursor position or just above it is affected. When [range] is used, Vim tries to only put or get the specified |