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