2021-06-13 19:02:49 +02:00
|
|
|
|
VIMDIFF(1) General Commands Manual VIMDIFF(1)
|
2004-06-13 20:20:40 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
NAME
|
2021-06-13 19:02:49 +02:00
|
|
|
|
vimdiff - edit between two and eight versions of a file with Vim and
|
|
|
|
|
show differences
|
2004-06-13 20:20:40 +00:00
|
|
|
|
|
|
|
|
|
SYNOPSIS
|
2021-06-13 19:02:49 +02:00
|
|
|
|
vimdiff [options] file1 file2 [file3 [file4 [file5 [file6 [file7
|
|
|
|
|
[file8]]]]]]
|
2004-06-13 20:20:40 +00:00
|
|
|
|
|
|
|
|
|
gvimdiff
|
|
|
|
|
|
|
|
|
|
DESCRIPTION
|
2021-06-13 19:02:49 +02:00
|
|
|
|
Vimdiff starts Vim on two up to eight 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 an‐
|
|
|
|
|
other version of the same file.
|
2004-06-13 20:20:40 +00:00
|
|
|
|
|
|
|
|
|
See vim(1) for details about Vim itself.
|
|
|
|
|
|
2005-04-15 21:00:38 +00:00
|
|
|
|
When started as gvimdiff the GUI will be started, if available.
|
2004-06-13 20:20:40 +00:00
|
|
|
|
|
2021-06-13 19:02:49 +02:00
|
|
|
|
In each window the 'diff' option will be set, which causes the differ‐
|
2005-04-15 21:00:38 +00:00
|
|
|
|
ences 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.
|
2004-06-13 20:20:40 +00:00
|
|
|
|
|
|
|
|
|
OPTIONS
|
2005-04-15 21:00:38 +00:00
|
|
|
|
Vertical splits are used to align the lines, as if the "-O" argument
|
2005-06-30 21:52:39 +00:00
|
|
|
|
was used. To use horizontal splits instead, use the "-o" argument.
|
2004-06-13 20:20:40 +00:00
|
|
|
|
|
|
|
|
|
For all other arguments see vim(1).
|
|
|
|
|
|
|
|
|
|
SEE ALSO
|
|
|
|
|
vim(1)
|
|
|
|
|
|
|
|
|
|
AUTHOR
|
2005-04-15 21:00:38 +00:00
|
|
|
|
Most of Vim was made by Bram Moolenaar, with a lot of help from others.
|
|
|
|
|
See ":help credits" in Vim.
|
2004-06-13 20:20:40 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2024-08-15 21:39:33 +02:00
|
|
|
|
2021 June 13 VIMDIFF(1)
|