xref: /vim-8.2.3635/runtime/doc/vimdiff.man (revision 071d4279)
1
2
3
4VIMDIFF(1)                                             VIMDIFF(1)
5
6
7NAME
8       vimdiff  -  edit  two or three versions of a file with Vim
9       and show differences
10
11SYNOPSIS
12       vimdiff [options] file1 file2 [file3]
13
14       gvimdiff
15
16DESCRIPTION
17       Vimdiff starts Vim on two (or  three)  files.   Each  file
18       gets  its  own  window.  The differences between the files
19       are highlighted.  This is a nice way  to  inspect  changes
20       and to move changes from one version to another version of
21       the same file.
22
23       See vim(1) for details about Vim itself.
24
25       When started as gvimdiff  the  GUI  will  be  started,  if
26       available.
27
28       In each window the 'diff' option will be set, which causes
29       the differences to be highlighted.
30       The 'wrap' and 'scrollbind' options are set  to  make  the
31       text look good.
32       The  'foldmethod'  option  is  set  to  "diff", which puts
33       ranges of lines without changes in a  fold.   'foldcolumn'
34       is  set  to two to make it easy to spot the folds and open
35       or close them.
36
37OPTIONS
38       Vertical splits are used to align the  lines,  as  if  the
39       "-O"  argument was used.  To use horizontal splits intead,
40       use the "-o" argument.
41
42       For all other arguments see vim(1).
43
44SEE ALSO
45       vim(1)
46
47AUTHOR
48       Most of Vim was made by Bram Moolenaar, with a lot of help
49       from others.  See ":help credits" in Vim.
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64                          2001 March 30                         1
65
66
67