diff options
| author | Bram Moolenaar <Bram@vim.org> | 2005-09-25 22:16:38 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2005-09-25 22:16:38 +0000 |
| commit | 1e01546026ce909b5fe56c05867f28e77d1b6eb3 (patch) | |
| tree | 05ccef65c430097352670acbbeb5520d649ba841 /runtime/doc/diff.txt | |
| parent | bfd8fc0529f46612f7b3efca6c7b3305e70ac374 (diff) | |
updated for version 7.0150
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 7d6383126a..fdd820f84e 100644 --- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -1,4 +1,4 @@ -*diff.txt* For Vim version 7.0aa. Last change: 2005 Apr 26 +*diff.txt* For Vim version 7.0aa. Last change: 2005 Sep 21 VIM REFERENCE MANUAL by Bram Moolenaar @@ -218,7 +218,7 @@ It is an error if there is no change for the cursor to move to. ============================================================================== 4. Diff copying *copy-diffs* *E99* *E100* *E101* *E102* *E103* - + *merge* There are two commands to copy text from one buffer to another. The result is that the buffers will be equal within the specified range. @@ -235,6 +235,8 @@ that the buffers will be equal within the specified range. Modify another buffer to undo difference with the current buffer. Just like ":diffget" but the other buffer is modified instead of the current one. + When [bufspec] is omitted and there is more than one other + buffer in diff mode where 'modifiable' is set this fails. See below for [range]. *do* |