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