1VIMDIFF(1) VIMDIFF(1) 2 3 4 5NAME 6 vimdiff - edit two, three or four versions of a file with Vim and show 7 differences 8 9SYNOPSIS 10 vimdiff [options] file1 file2 [file3 [file4]] 11 12 gvimdiff 13 14DESCRIPTION 15 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. 19 20 See vim(1) for details about Vim itself. 21 22 When started as gvimdiff the GUI will be started, if available. 23 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. 30 31OPTIONS 32 Vertical splits are used to align the lines, as if the "-O" argument 33 was used. To use horizontal splits instead, use the "-o" argument. 34 35 For all other arguments see vim(1). 36 37SEE ALSO 38 vim(1) 39 40AUTHOR 41 Most of Vim was made by Bram Moolenaar, with a lot of help from others. 42 See ":help credits" in Vim. 43 44 45 46 2001 March 30 VIMDIFF(1) 47