VIMDIFF(1) VIMDIFF(1)
NAME
vimdiff - edit two or three versions of a file(1,n) with Vim and show dif-
ferences
SYNOPSIS
vimdiff [options] file1 file2 [file3]
gvimdiff
DESCRIPTION
Vimdiff starts Vim on two (or three) files. Each file(1,n) gets(3,n) its own
window. The differences between the files are highlighted. This is a
nice(1,2) way to inspect changes and to move(3x,7,3x curs_move) changes from one version(1,3,5) to
another version(1,3,5) of the same file.
See vim(1) for details about Vim itself.
When started as gvimdiff the GUI will be started, if(3,n) available.
In each window the 'diff' option will be set(7,n,1 builtins), which causes the differ-
ences to be highlighted.
The 'wrap' and 'scrollbind' options are set(7,n,1 builtins) to make the text look(1,8,3 Search::Dict) good.
The 'foldmethod' option is set(7,n,1 builtins) to "diff", which puts(3,n) ranges of lines
without changes in(1,8) a fold. 'foldcolumn' is set(7,n,1 builtins) to two to make it easy
to spot the folds and open(2,3,n) or close(2,7,n) them.
OPTIONS
Vertical splits are used to align the lines, as if(3,n) 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(1,8) Vim.
2001 March 30 VIMDIFF(1)