xref: /vim-8.2.3635/runtime/doc/vimdiff.man (revision 2346a637)
1*2346a637SBram MoolenaarVIMDIFF(1)                  General Commands Manual                 VIMDIFF(1)
2071d4279SBram Moolenaar
3071d4279SBram Moolenaar
4402d2feaSBram Moolenaar
5071d4279SBram MoolenaarNAME
6*2346a637SBram Moolenaar       vimdiff  -  edit  between two and eight versions of a file with Vim and
7*2346a637SBram Moolenaar       show differences
8071d4279SBram Moolenaar
9071d4279SBram MoolenaarSYNOPSIS
10*2346a637SBram Moolenaar       vimdiff [options]  file1  file2  [file3  [file4  [file5  [file6  [file7
11*2346a637SBram Moolenaar       [file8]]]]]]
12071d4279SBram Moolenaar
13071d4279SBram Moolenaar       gvimdiff
14071d4279SBram Moolenaar
15071d4279SBram MoolenaarDESCRIPTION
16*2346a637SBram Moolenaar       Vimdiff  starts  Vim  on two up to eight files.  Each file gets its own
17*2346a637SBram Moolenaar       window.  The differences between the files are highlighted.  This is  a
18*2346a637SBram Moolenaar       nice way to inspect changes and to move changes from one version to an‐
19*2346a637SBram Moolenaar       other version of the same file.
20071d4279SBram Moolenaar
21071d4279SBram Moolenaar       See vim(1) for details about Vim itself.
22071d4279SBram Moolenaar
23402d2feaSBram Moolenaar       When started as gvimdiff the GUI will be started, if available.
24071d4279SBram Moolenaar
25*2346a637SBram Moolenaar       In each window the 'diff' option will be set, which causes the  differ‐
26402d2feaSBram Moolenaar       ences to be highlighted.
27402d2feaSBram Moolenaar       The 'wrap' and 'scrollbind' options are set to make the text look good.
28402d2feaSBram Moolenaar       The  'foldmethod'  option  is set to "diff", which puts ranges of lines
29402d2feaSBram Moolenaar       without changes in a fold.  'foldcolumn' is set to two to make it  easy
30402d2feaSBram Moolenaar       to spot the folds and open or close them.
31071d4279SBram Moolenaar
32071d4279SBram MoolenaarOPTIONS
33402d2feaSBram Moolenaar       Vertical  splits  are  used to align the lines, as if the "-O" argument
349c96f592SBram Moolenaar       was used.  To use horizontal splits instead, use the "-o" argument.
35071d4279SBram Moolenaar
36071d4279SBram Moolenaar       For all other arguments see vim(1).
37071d4279SBram Moolenaar
38071d4279SBram MoolenaarSEE ALSO
39071d4279SBram Moolenaar       vim(1)
40071d4279SBram Moolenaar
41071d4279SBram MoolenaarAUTHOR
42402d2feaSBram Moolenaar       Most of Vim was made by Bram Moolenaar, with a lot of help from others.
43402d2feaSBram Moolenaar       See ":help credits" in Vim.
44071d4279SBram Moolenaar
45071d4279SBram Moolenaar
46071d4279SBram Moolenaar
47402d2feaSBram Moolenaar                                 2001 March 30                      VIMDIFF(1)
48