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