IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove vimdiff: Review suggestions

Browse Source
This commit is contained in:
Michael Reed 2015-02-03 16:51:41 -05:00
parent 7b98b4c442
commit a720b64851
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
runtime/doc/diff.txt
View File

@ -22,9 +22,9 @@ The basics are explained in section |08.7| of the user manual.
To start editing in diff mode, start Nvim with "nvim -d". This starts Nvim To start editing in diff mode, start Nvim with "nvim -d". This starts Nvim
and sets up for viewing the differences between the arguments. > and sets up for viewing the differences between the arguments. >
$ nvim -d file1 file2 [file3 [file4]] nvim -d file1 file2 [file3 [file4]]
In addition to the |-d| argument, |-R| and |-Z| may be used for restricted In addition to the |-d| argument, |-Z| and |-R| may be used for restricted
mode and read only mode respectively. mode and read only mode respectively.
The second and following arguments may also be a directory name. Vim will The second and following arguments may also be a directory name. Vim will
@ -41,7 +41,7 @@ What happens is that Nvim opens a window for each of the files. This is like
using the |-O| argument. This uses vertical splits, but if you prefer using the |-O| argument. This uses vertical splits, but if you prefer
horizontal splits add the |-o| argument instead: > horizontal splits add the |-o| argument instead: >
$ nvim -d -o file1 file2 [file3 [file4]] nvim -d -o file1 file2 [file3 [file4]]
If you always prefer horizontal splits include "horizontal" in 'diffopt'. If you always prefer horizontal splits include "horizontal" in 'diffopt'.

2
runtime/doc/usr_28.txt
View File

@ -376,7 +376,7 @@ More about folding by expression in the reference manual: |fold-expr|
*28.9* Folding unchanged lines *28.9* Folding unchanged lines
This is useful when you set the 'diff' option in the same window. The This is useful when you set the 'diff' option in the same window. The
|-d| argument does this for you. Example: > |-d| option does this for you. Example: >
:setlocal diff foldmethod=diff scrollbind nowrap foldlevel=1 :setlocal diff foldmethod=diff scrollbind nowrap foldlevel=1