diff options
| author | Florian Walch <florian@fwalch.com> | 2015-05-18 18:30:10 +0300 |
|---|---|---|
| committer | Florian Walch <florian@fwalch.com> | 2015-05-19 12:44:56 +0300 |
| commit | 90fae3663f543e9573c4e69380cfcdcbc7bb34fc (patch) | |
| tree | 5d4afe1d52a3ce18c0f8a9ffbfc5dc0891f2246b /runtime/doc/diff.txt | |
| parent | 73137e0a84d73196db1a8d66a45210f7ffb6632d (diff) | |
| download | rneovim-90fae3663f543e9573c4e69380cfcdcbc7bb34fc.tar.gz rneovim-90fae3663f543e9573c4e69380cfcdcbc7bb34fc.tar.bz2 rneovim-90fae3663f543e9573c4e69380cfcdcbc7bb34fc.zip | |
vim-patch:4abac79 #2694
Update runtime files.
https://code.google.com/p/vim/source/detail?r=4abac79c0b7ae7aac0cb32d9930e155de628b63f
Diffstat (limited to 'runtime/doc/diff.txt')
| -rw-r--r-- | runtime/doc/diff.txt | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt index 4aea7b4968..909aedb221 100644 --- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -258,13 +258,17 @@ that the buffers will be equal within the specified range. See below for [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"!). Note: this doesn't work in Visual mode. +[count]do Same as ":diffget" without range. The "o" stands for "obtain" + ("dg" can't be used, it could be the start of "dgg"!). Note: + this doesn't work in Visual mode. + If you give a [count], it is used as the [bufspec] argument + for ":diffget". *dp* -dp Same as ":diffput" without argument or range. - Note: this doesn't work in Visual mode. +[count]dp Same as ":diffput" without range. Note: this doesn't work in + Visual mode. + If you give a [count], it is used as the [bufspec] argument + for ":diffput". When no [range] is given, the diff at the cursor position or just above it is |