diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-07-11 04:05:51 +0000 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-07-29 02:12:31 +0000 |
| commit | a98a6996c291b3e300d27b791eded9eed333d677 (patch) | |
| tree | 51d92f6cac128f938cd0aaa9a8dd0ce7a83d63a9 /runtime/doc/vimdiff.1 | |
| parent | 66bc13163398786c88e20b7cdd61c66978b4d3fb (diff) | |
| download | rneovim-a98a6996c291b3e300d27b791eded9eed333d677.tar.gz rneovim-a98a6996c291b3e300d27b791eded9eed333d677.tar.bz2 rneovim-a98a6996c291b3e300d27b791eded9eed333d677.zip | |
re-integrate runtime/ vim-patch:0 #938
Vim runtime files based on 7.4.384 / hg changeset 7090d7f160f7
Excluding:
Amiga icons (*.info, icons/)
doc/hangulin.txt
tutor/
spell/
lang/ (only used for menu translations)
macros/maze/, macros/hanoi/, macros/life/, macros/urm/
These were used to test vi compatibility.
termcap
"Demonstration of a termcap file (for the Amiga and Archimedes)"
Helped-by: Rich Wareham <rjw57@cam.ac.uk>
Helped-by: John <john.schmidt.h@gmail.com>
Helped-by: Yann <yann@yann-salaun.com>
Helped-by: Christophe Badoit <c.badoit@lesiteimmo.com>
Helped-by: drasill <github@tof2k.com>
Helped-by: Tae Sandoval Murgan <taecilla@gmail.com>
Helped-by: Lowe Thiderman <lowe.thiderman@gmail.com>
Diffstat (limited to 'runtime/doc/vimdiff.1')
| -rw-r--r-- | runtime/doc/vimdiff.1 | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/runtime/doc/vimdiff.1 b/runtime/doc/vimdiff.1 new file mode 100644 index 0000000000..bed2b32889 --- /dev/null +++ b/runtime/doc/vimdiff.1 @@ -0,0 +1,46 @@ +.TH VIMDIFF 1 "2001 March 30" +.SH NAME +vimdiff \- edit two, three or four versions of a file with Vim and show differences +.SH SYNOPSIS +.br +.B vimdiff +[options] file1 file2 [file3 [file4]] +.PP +.B gvimdiff +.SH DESCRIPTION +.B Vimdiff +starts +.B Vim +on two (or three or four) files. +Each file gets its own window. +The differences between the files are highlighted. +This is a nice way to inspect changes and to move changes from one version +to another version of the same file. +.PP +See vim(1) for details about Vim itself. +.PP +When started as +.B gvimdiff +the GUI will be started, if available. +.PP +In each window the 'diff' option will be set, which causes the differences +to be highlighted. +.br +The 'wrap' and 'scrollbind' options are set to make the text look good. +.br +The 'foldmethod' option is set to "diff", which puts ranges of lines without +changes in a fold. 'foldcolumn' is set to two to make it easy to spot the +folds and open or close them. +.SH OPTIONS +Vertical splits are used to align the lines, as if the "\-O" argument was used. +To use horizontal splits instead, use the "\-o" argument. +.PP +For all other arguments see vim(1). +.SH SEE ALSO +vim(1) +.SH AUTHOR +Most of +.B Vim +was made by Bram Moolenaar, with a lot of help from others. +See ":help credits" in +.B Vim. |