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