Penguin
Recent Changes
Annotated edit history of vimdiff(1) version 1, including all changes. View license author blame.
Rev Author # Line
1 perry 1 VIMDIFF
2 !!!VIMDIFF
3 NAME
4 SYNOPSIS
5 DESCRIPTION
6 OPTIONS
7 SEE ALSO
8 AUTHOR
9 ----
10 !!NAME
11
12
13 vimdiff - edit two or three versions of a file with Vim and show differences
14 !!SYNOPSIS
15
16
17 __vimdiff__ [[options] file1 file2 [[file3]
18
19
20 __gvimdiff__
21 !!DESCRIPTION
22
23
24 __Vimdiff__ starts __Vim__ on two (or three) files.
25 Each file gets its own window. The differences between the
26 files are highlighted. This is a nice way to inspect changes
27 and to move changes from one version to another version of
28 the same file.
29
30
31 See vim(1) for details about Vim itself.
32
33
34 When started as __gvimdiff__ the GUI will be started, if
35 available.
36
37
38 In each window the 'diff' option will be set, which causes
39 the differences to be highlighted.
40 The 'wrap' and 'scrollbind' options are set to make the text
41 look good.
42 The 'foldmethod' option is set to
43 !!OPTIONS
44
45
46 Vertical splits are used to align the lines, as if the
47
48
49 For all other arguments see vim(1).
50 !!SEE ALSO
51
52
53 vim(1)
54 !!AUTHOR
55
56
57 Most of __Vim__ was made by Bram Moolenaar, with a lot of
58 help from others. See
59 __Vim.__
60 ----
This page is a man page (or other imported legacy content). We are unable to automatically determine the license status of this page.