diff options
| author | ZyX <kp-pav@yandex.ru> | 2017-11-19 22:05:22 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2017-11-19 22:05:22 +0300 |
| commit | 03a129aacf7e4b77ceaccc71251ecb5bf41d2a8f (patch) | |
| tree | a3a05c99fe20de98aafbdea9314aa0d76f71aee9 /runtime/doc/diff.txt | |
| parent | 6ea3a08fdbb276fe64dda60c5fb934360327ed39 (diff) | |
| parent | de8b1fd1dee5a91b2893fccc53cfd11631ccba38 (diff) | |
| download | rneovim-03a129aacf7e4b77ceaccc71251ecb5bf41d2a8f.tar.gz rneovim-03a129aacf7e4b77ceaccc71251ecb5bf41d2a8f.tar.bz2 rneovim-03a129aacf7e4b77ceaccc71251ecb5bf41d2a8f.zip | |
Merge branch 'master' into expression-parser
Diffstat (limited to 'runtime/doc/diff.txt')
| -rw-r--r-- | runtime/doc/diff.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt index 8cb049584a..b9dccc42a8 100644 --- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -13,7 +13,7 @@ The basics are explained in section |08.7| of the user manual. Type |gO| to see the table of contents. ============================================================================== -1. Starting diff mode +1. Starting diff mode *start-vimdiff* To start editing in diff mode, run "nvim -d". This starts Nvim as usual, and additionally sets up for viewing the differences between the arguments. > @@ -214,8 +214,8 @@ The diffs are highlighted with these groups: (searching from the end of the line). The text in between is highlighted. This means that parts in the middle that are still the - same are highlighted anyway. Only "iwhite" of - 'diffopt' is used here. + same are highlighted anyway. The 'diffopt' + flags "iwhite" and "icase" are used here. |hl-DiffDelete| DiffDelete Deleted lines. Also called filler lines, because they don't really exist in this buffer. @@ -314,7 +314,7 @@ g:diff_translations to zero: > let g:diff_translations = 0 < -After setting this variable, Reload the syntax script: > +After setting this variable, reload the syntax script: > set syntax=diff < |