blob: 913ac1384792c991f7f41a030a761c0ca2692bd8 [file] [log] [blame]
Bram Moolenaar402d2fe2005-04-15 21:00:38 +00001VIMDIFF(1) VIMDIFF(1)
Bram Moolenaar071d4272004-06-13 20:20:40 +00002
3
4
Bram Moolenaar071d4272004-06-13 20:20:40 +00005NAME
Bram Moolenaare37d50a2008-08-06 17:06:04 +00006 vimdiff - edit two, three or four versions of a file with Vim and show
7 differences
Bram Moolenaar071d4272004-06-13 20:20:40 +00008
9SYNOPSIS
Bram Moolenaare37d50a2008-08-06 17:06:04 +000010 vimdiff [options] file1 file2 [file3 [file4]]
Bram Moolenaar071d4272004-06-13 20:20:40 +000011
12 gvimdiff
13
14DESCRIPTION
Bram Moolenaare37d50a2008-08-06 17:06:04 +000015 Vimdiff starts Vim on two (or three or four) files. Each file gets its
16 own window. The differences between the files are highlighted. This
17 is a nice way to inspect changes and to move changes from one version
18 to another version of the same file.
Bram Moolenaar071d4272004-06-13 20:20:40 +000019
20 See vim(1) for details about Vim itself.
21
Bram Moolenaar402d2fe2005-04-15 21:00:38 +000022 When started as gvimdiff the GUI will be started, if available.
Bram Moolenaar071d4272004-06-13 20:20:40 +000023
Bram Moolenaar402d2fe2005-04-15 21:00:38 +000024 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.
Bram Moolenaar071d4272004-06-13 20:20:40 +000030
31OPTIONS
Bram Moolenaar402d2fe2005-04-15 21:00:38 +000032 Vertical splits are used to align the lines, as if the "-O" argument
Bram Moolenaar9c96f592005-06-30 21:52:39 +000033 was used. To use horizontal splits instead, use the "-o" argument.
Bram Moolenaar071d4272004-06-13 20:20:40 +000034
35 For all other arguments see vim(1).
36
37SEE ALSO
38 vim(1)
39
40AUTHOR
Bram Moolenaar402d2fe2005-04-15 21:00:38 +000041 Most of Vim was made by Bram Moolenaar, with a lot of help from others.
42 See ":help credits" in Vim.
Bram Moolenaar071d4272004-06-13 20:20:40 +000043
44
45
Bram Moolenaar402d2fe2005-04-15 21:00:38 +000046 2001 March 30 VIMDIFF(1)