diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-08-02 19:22:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-02 19:22:23 +0200 |
| commit | a270c33b3a49d7a47b1bb6e6b9eb2073d98e0602 (patch) | |
| tree | 7561e413d75fdb008c2bdf81dc63f31806116d5c /runtime/doc/diff.txt | |
| parent | 1aedb9ed00e40f54bb3303ab6d2da4a0f6e2fbb6 (diff) | |
| parent | e2e220256e7e62b6b7df9ba65cd3fdf32390652b (diff) | |
| download | rneovim-a270c33b3a49d7a47b1bb6e6b9eb2073d98e0602.tar.gz rneovim-a270c33b3a49d7a47b1bb6e6b9eb2073d98e0602.tar.bz2 rneovim-a270c33b3a49d7a47b1bb6e6b9eb2073d98e0602.zip | |
Merge #10675 from justinmk/vim-runtime
fix #10572
Diffstat (limited to 'runtime/doc/diff.txt')
| -rw-r--r-- | runtime/doc/diff.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt index ab002b4dcb..dcc3035d41 100644 --- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -175,7 +175,7 @@ hidden buffers. You can use ":hide" to close a window without unloading the buffer. If you don't want a buffer to remain used for the diff do ":set nodiff" before hiding it. - *:dif* *:diffupdate* + *:dif* *:diff* *:diffupdate* :dif[fupdate][!] Update the diff highlighting and folds. Vim attempts to keep the differences updated when you make changes to the @@ -325,7 +325,7 @@ 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. +"diff" program to compare two files and find the differences. *E959* When 'diffexpr' is empty, Vim uses this command to find the differences between file1 and file2: > |