diff options
author | Anatolii Sakhnik <sakhnik@gmail.com> | 2018-12-02 22:58:07 +0200 |
---|---|---|
committer | Anatolii Sakhnik <sakhnik@gmail.com> | 2018-12-09 19:45:56 +0200 |
commit | cf1ffa91667a482c6355f5999b9e97ccc0b4126a (patch) | |
tree | 0b30423f48fcd3ff19afe6142ee66db5f31cf7d3 /runtime/doc/diff.txt | |
parent | 67c5bc1ac082236c0a36c785619987b9462aa89a (diff) | |
download | rneovim-cf1ffa91667a482c6355f5999b9e97ccc0b4126a.tar.gz rneovim-cf1ffa91667a482c6355f5999b9e97ccc0b4126a.tar.bz2 rneovim-cf1ffa91667a482c6355f5999b9e97ccc0b4126a.zip |
vim-patch:8.1.0360: using an external diff program is slow and inflexible
Problem: Using an external diff program is slow and inflexible.
Solution: Include the xdiff library. (Christian Brabandt)
Use it by default.
https://github.com/vim/vim/commit/e828b7621cf9065a3582be0c4dd1e0e846e335bf
vim-patch:8.1.0360
vim-patch:8.1.0364
vim-patch:8.1.0366
vim-patch:8.1.0370
vim-patch:8.1.0377
vim-patch:8.1.0378
vim-patch:8.1.0381
vim-patch:8.1.0396
vim-patch:8.1.0432
Diffstat (limited to 'runtime/doc/diff.txt')
-rw-r--r-- | runtime/doc/diff.txt | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt index 766240dfb0..ab002b4dcb 100644 --- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -27,7 +27,9 @@ The second and following arguments may also be a directory name. Vim will then append the file name of the first argument to the directory name to find the file. -This only works when a standard "diff" command is available. See 'diffexpr'. +By default an internal diff library will be used. When 'diffopt' or +'diffexpr' has been set an external "diff" command will be used. This only +works when such a diff program is available. Diffs are local to the current tab page |tab-page|. You can't see diffs with a window in another tab page. This does make it possible to have several @@ -332,8 +334,9 @@ between file1 and file2: > The ">" is replaced with the value of 'shellredir'. -The output of "diff" must be a normal "ed" style diff. Do NOT use a context -diff. This example explains the format that Vim expects: > +The output of "diff" must be a normal "ed" style diff or a unified diff. Do +NOT use a context diff. This example explains the format that Vim expects for +the "ed" style diff: > 1a2 > bbb |