diff options
| author | Bram Moolenaar <Bram@vim.org> | 2005-04-15 21:00:38 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2005-04-15 21:00:38 +0000 |
| commit | 402d2fea7025356c7abcb891017a1b7ddf99cbbf (patch) | |
| tree | 83c5973b6316912331d4a4c070996d7888097e5c /runtime/doc/vimdiff.man | |
| parent | 4499d2ee58db42e4ec59bb2c2dbb5eeca2313e8b (diff) | |
| download | vim-git-402d2fea7025356c7abcb891017a1b7ddf99cbbf.tar.gz | |
updated for version 7.0066
Diffstat (limited to 'runtime/doc/vimdiff.man')
| -rw-r--r-- | runtime/doc/vimdiff.man | 58 |
1 files changed, 19 insertions, 39 deletions
diff --git a/runtime/doc/vimdiff.man b/runtime/doc/vimdiff.man index 771ce9d0e..fb0663c13 100644 --- a/runtime/doc/vimdiff.man +++ b/runtime/doc/vimdiff.man @@ -1,12 +1,10 @@ +VIMDIFF(1) VIMDIFF(1) -VIMDIFF(1) VIMDIFF(1) - - NAME - vimdiff - edit two or three versions of a file with Vim - and show differences + vimdiff - edit two or three versions of a file with Vim and show dif- + ferences SYNOPSIS vimdiff [options] file1 file2 [file3] @@ -14,30 +12,25 @@ SYNOPSIS gvimdiff DESCRIPTION - Vimdiff starts Vim on two (or three) files. Each file - gets its own window. The differences between the files - are highlighted. This is a nice way to inspect changes - and to move changes from one version to another version of - the same file. + Vimdiff starts Vim on two (or three) files. Each file gets its own + window. The differences between the files are highlighted. This is a + nice way to inspect changes and to move changes from one version to + another version of the same file. See vim(1) for details about Vim itself. - When started as gvimdiff the GUI will be started, if - available. + When started as gvimdiff the GUI will be started, if available. - In each window the 'diff' option will be set, which causes - the differences to be highlighted. - The 'wrap' and 'scrollbind' options are set to make the - text look good. - The 'foldmethod' option is set to "diff", which puts - ranges of lines without changes in a fold. 'foldcolumn' - is set to two to make it easy to spot the folds and open - or close them. + In each window the 'diff' option will be set, which causes the differ- + ences to be highlighted. + The 'wrap' and 'scrollbind' options are set to make the text look good. + The 'foldmethod' option is set to "diff", which puts ranges of lines + without changes in a fold. 'foldcolumn' is set to two to make it easy + to spot the folds and open or close them. OPTIONS - Vertical splits are used to align the lines, as if the - "-O" argument was used. To use horizontal splits intead, - use the "-o" argument. + Vertical splits are used to align the lines, as if the "-O" argument + was used. To use horizontal splits intead, use the "-o" argument. For all other arguments see vim(1). @@ -45,22 +38,9 @@ SEE ALSO vim(1) AUTHOR - Most of Vim was made by Bram Moolenaar, with a lot of help - from others. See ":help credits" in Vim. - - - - - - - - - - - - - + Most of Vim was made by Bram Moolenaar, with a lot of help from others. + See ":help credits" in Vim. - 2001 March 30 1 + 2001 March 30 VIMDIFF(1) |