diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-09-10 17:51:58 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-09-10 17:51:58 +0200 |
| commit | e828b7621cf9065a3582be0c4dd1e0e846e335bf (patch) | |
| tree | 79cf05b6295837108fb6edbbc154e333c940698a /runtime/doc/diff.txt | |
| parent | 93a1df2c205c8399d96c172d9483e0793d32892a (diff) | |
patch 8.1.0360: using an external diff program is slow and inflexiblev8.1.0360
Problem: Using an external diff program is slow and inflexible.
Solution: Include the xdiff library. (Christian Brabandt, closes #2732)
Use it by default.
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 d56aea72ad..6670f45c64 100644 --- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -39,7 +39,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 @@ -344,8 +346,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 |