mirror of
https://github.com/vim/vim.git
synced 2025-09-26 04:04:07 -04:00
updated for version 7.0001
This commit is contained in:
66
runtime/doc/vimdiff.man
Normal file
66
runtime/doc/vimdiff.man
Normal file
@@ -0,0 +1,66 @@
|
||||
|
||||
|
||||
|
||||
VIMDIFF(1) VIMDIFF(1)
|
||||
|
||||
|
||||
NAME
|
||||
vimdiff - edit two or three versions of a file with Vim
|
||||
and show differences
|
||||
|
||||
SYNOPSIS
|
||||
vimdiff [options] file1 file2 [file3]
|
||||
|
||||
gvimdiff
|
||||
|
||||
DESCRIPTION
|
||||
Vimdiff starts Vim on two (or three) 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.
|
||||
|
||||
See vim(1) for details about Vim itself.
|
||||
|
||||
When started as gvimdiff the GUI will be started, if
|
||||
available.
|
||||
|
||||
In each window the 'diff' option will be set, which causes
|
||||
the differences to be highlighted.
|
||||
The 'wrap' and 'scrollbind' options are set to make the
|
||||
text look good.
|
||||
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.
|
||||
|
||||
OPTIONS
|
||||
Vertical splits are used to align the lines, as if the
|
||||
"-O" argument was used. To use horizontal splits intead,
|
||||
use the "-o" argument.
|
||||
|
||||
For all other arguments see vim(1).
|
||||
|
||||
SEE ALSO
|
||||
vim(1)
|
||||
|
||||
AUTHOR
|
||||
Most of Vim was made by Bram Moolenaar, with a lot of help
|
||||
from others. See ":help credits" in Vim.
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
2001 March 30 1
|
||||
|
||||
|
Reference in New Issue
Block a user