diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-05-22 18:26:40 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-05-22 18:26:40 +0200 |
| commit | 13600303c539816933e8b74d14cc518b00f250f8 (patch) | |
| tree | 13c219a0463d31180543b48567aa67c7ba6f919a /runtime/doc/diff.txt | |
| parent | 90013c6a751e6574fbe49b529a3dbf1eacbef43d (diff) | |
Runtime file updates.
Diffstat (limited to 'runtime/doc/diff.txt')
| -rw-r--r-- | runtime/doc/diff.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt index 96dff35096..0ee5878341 100644 --- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -1,4 +1,4 @@ -*diff.txt* For Vim version 7.4. Last change: 2013 Sep 20 +*diff.txt* For Vim version 7.4. Last change: 2014 May 20 VIM REFERENCE MANUAL by Bram Moolenaar @@ -95,7 +95,7 @@ While already in Vim you can start diff mode in three ways. :difft[his] Make the current window part of the diff windows. This sets the options like for "vimdiff". -:diffp[atch] {patchfile} *E816* *:diffp* *:diffpatch* +:diffp[atch] {patchfile} *E816* *:diffp* *:diffpatch* Use the current buffer, patch it with the diff found in {patchfile} and open a buffer on the result. The options are set as for "vimdiff". |