diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-12-09 23:00:03 +0100 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2018-12-09 23:07:28 +0100 |
| commit | 20620bae76deddd892df2d33f9e745efd5d8598b (patch) | |
| tree | 8c43e2387210e7a561dad08b2cda8e0370f0eb72 /runtime/doc/diff.txt | |
| parent | 857a7312d015350c9637548310c7a187637d3ca4 (diff) | |
| parent | 4e2981081796c8618caa4bed30d12e1e8fc8ae08 (diff) | |
| download | rneovim-20620bae76deddd892df2d33f9e745efd5d8598b.tar.gz rneovim-20620bae76deddd892df2d33f9e745efd5d8598b.tar.bz2 rneovim-20620bae76deddd892df2d33f9e745efd5d8598b.zip | |
Merge #9306 'vim-patch: integrate xdiff library'
closes #1466
closes #1007
closes #1391
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 |