blob: efbb84a8dd1f1de633411c6aa949021843332ae3 [file] [log] [blame]
RestorerZ81b62dd2024-08-15 21:39:33 +02001.TH VIMDIFF 1 "2021 June 13"
Bram Moolenaar071d4272004-06-13 20:20:40 +00002.SH NAME
Bram Moolenaar2346a632021-06-13 19:02:49 +02003vimdiff \- edit between two and eight versions of a file with Vim and show differences
Bram Moolenaar071d4272004-06-13 20:20:40 +00004.SH SYNOPSIS
5.br
6.B vimdiff
Bram Moolenaar2346a632021-06-13 19:02:49 +02007[options] file1 file2 [file3 [file4 [file5 [file6 [file7 [file8]]]]]]
Bram Moolenaar071d4272004-06-13 20:20:40 +00008.PP
9.B gvimdiff
10.SH DESCRIPTION
11.B Vimdiff
12starts
13.B Vim
Bram Moolenaar2346a632021-06-13 19:02:49 +020014on two up to eight files.
Bram Moolenaar071d4272004-06-13 20:20:40 +000015Each file gets its own window.
16The differences between the files are highlighted.
17This is a nice way to inspect changes and to move changes from one version
18to another version of the same file.
19.PP
20See vim(1) for details about Vim itself.
21.PP
22When started as
23.B gvimdiff
24the GUI will be started, if available.
25.PP
26In each window the 'diff' option will be set, which causes the differences
27to be highlighted.
28.br
29The 'wrap' and 'scrollbind' options are set to make the text look good.
30.br
31The 'foldmethod' option is set to "diff", which puts ranges of lines without
32changes in a fold. 'foldcolumn' is set to two to make it easy to spot the
33folds and open or close them.
34.SH OPTIONS
Bram Moolenaar2641f772005-03-25 21:58:17 +000035Vertical splits are used to align the lines, as if the "\-O" argument was used.
Bram Moolenaar0e6830e2005-05-27 20:23:44 +000036To use horizontal splits instead, use the "\-o" argument.
Bram Moolenaar071d4272004-06-13 20:20:40 +000037.PP
38For all other arguments see vim(1).
39.SH SEE ALSO
40vim(1)
41.SH AUTHOR
42Most of
43.B Vim
44was made by Bram Moolenaar, with a lot of help from others.
45See ":help credits" in
46.B Vim.