diff options
| author | Christian Clason <christian.clason@uni-due.de> | 2021-09-08 16:24:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-08 07:24:12 -0700 |
| commit | 79cbbd5179d816a64989243cb1ce85b802a2896f (patch) | |
| tree | 4660059fb6aff39fccf4b9621b3ab4a6a06f9fc7 /runtime/doc/diff.txt | |
| parent | 5e5a329ea2e1742819320636d978e03bb030986f (diff) | |
| download | rneovim-79cbbd5179d816a64989243cb1ce85b802a2896f.tar.gz rneovim-79cbbd5179d816a64989243cb1ce85b802a2896f.tar.bz2 rneovim-79cbbd5179d816a64989243cb1ce85b802a2896f.zip | |
vim-patch:d2ea7cf10a4d #15571
Update runtime files
https://github.com/vim/vim/commit/d2ea7cf10a4d026ebd402594d656af7d5c811c24
omit `runtime/doc/if_tcl.txt`
omit `runtime/doc/textprop.txt`
omit `runtime/tutor/*`
omit `runtime/syntax/vim.vim` (cherry-picked in https://github.com/neovim/neovim/commit/2dd7828511d04a8b7f1ac4331c719a751a5db869)
manual merge of `runtime/pack/dist/opt/termdebug/plugin/termdebug.vim`
Diffstat (limited to 'runtime/doc/diff.txt')
| -rw-r--r-- | runtime/doc/diff.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt index a9e2a0d522..6115a5d235 100644 --- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -334,9 +334,11 @@ between file1 and file2: > The ">" is replaced with the value of 'shellredir'. -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: > +The output of "diff" must be a normal "ed" style diff or a unified diff. A +context diff will NOT work. For a unified diff no context lines can be used. +Using "diff -u" will NOT work, use "diff -U0". + +This example explains the format that Vim expects for the "ed" style diff: > 1a2 > bbb |