diff options
| author | Michael Reed <m.reed@mykolab.com> | 2015-02-03 16:51:41 -0500 |
|---|---|---|
| committer | Michael Reed <m.reed@mykolab.com> | 2015-02-03 16:51:41 -0500 |
| commit | a720b648512244bbfc7e2de633f0baed94a32446 (patch) | |
| tree | e837f8590544b8166418d1910bf01ecdeccefd11 | |
| parent | 7b98b4c442e3e8e9cebf6288f1f41ef0ffa42ba3 (diff) | |
| download | rneovim-a720b648512244bbfc7e2de633f0baed94a32446.tar.gz rneovim-a720b648512244bbfc7e2de633f0baed94a32446.tar.bz2 rneovim-a720b648512244bbfc7e2de633f0baed94a32446.zip | |
Remove vimdiff: Review suggestions
| -rw-r--r-- | runtime/doc/diff.txt | 6 | ||||
| -rw-r--r-- | runtime/doc/usr_28.txt | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt index c539e45abd..35bfffec34 100644 --- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -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 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. 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 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'. diff --git a/runtime/doc/usr_28.txt b/runtime/doc/usr_28.txt index 56291aab8b..d29b384437 100644 --- a/runtime/doc/usr_28.txt +++ b/runtime/doc/usr_28.txt @@ -376,7 +376,7 @@ More about folding by expression in the reference manual: |fold-expr| *28.9* Folding unchanged lines 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 |