diff options
| author | Christian Clason <c.clason@uni-graz.at> | 2022-01-23 18:38:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-23 18:38:41 +0100 |
| commit | 4ba7fa1700ead8a53d73fea7fc17a545f9b4588d (patch) | |
| tree | fe19e0a4eafce40046fe3d001710a56c500fe501 /runtime/doc/diff.txt | |
| parent | 28352dc6e50b9559f32f054c56dc950a79ae45bc (diff) | |
| download | rneovim-4ba7fa1700ead8a53d73fea7fc17a545f9b4588d.tar.gz rneovim-4ba7fa1700ead8a53d73fea7fc17a545f9b4588d.tar.bz2 rneovim-4ba7fa1700ead8a53d73fea7fc17a545f9b4588d.zip | |
vim-patch:6f4754b9f725 (#17179)
Update runtime files
https://github.com/vim/vim/commit/6f4754b9f7253d7e4ba527064a24aff1acdb1e8f
Diffstat (limited to 'runtime/doc/diff.txt')
| -rw-r--r-- | runtime/doc/diff.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt index 6115a5d235..abe99102ee 100644 --- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -324,8 +324,9 @@ After setting this variable, reload the syntax script: > FINDING THE DIFFERENCES *diff-diffexpr* -The 'diffexpr' option can be set to use something else than the standard -"diff" program to compare two files and find the differences. *E959* +The 'diffexpr' option can be set to use something else than the internal diff +support or the standard "diff" program to compare two files and find the +differences. When 'diffexpr' is empty, Vim uses this command to find the differences between file1 and file2: > @@ -358,7 +359,7 @@ format mentioned. These variables are set to the file names used: v:fname_in original file v:fname_new new version of the same file - v:fname_out resulting diff file + v:fname_out where to write the resulting diff file Additionally, 'diffexpr' should take care of "icase" and "iwhite" in the 'diffopt' option. 'diffexpr' cannot change the value of 'lines' and |