diff options
author | Bram Moolenaar <Bram@vim.org> | 2008-08-06 17:06:04 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2008-08-06 17:06:04 +0000 |
commit | e37d50a5def1c0ff162392cd3f017059c458650c (patch) | |
tree | e7d1e2b17976b130d1283d33b091baf30cfc5d2c /runtime/doc/vimdiff.man | |
parent | da40c8536c2b7bdbd1d192ee1aa3045e2119675e (diff) | |
download | vim-git-e37d50a5def1c0ff162392cd3f017059c458650c.tar.gz |
updated for version 7.2c-000v7.2c.000
Diffstat (limited to 'runtime/doc/vimdiff.man')
-rw-r--r-- | runtime/doc/vimdiff.man | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/runtime/doc/vimdiff.man b/runtime/doc/vimdiff.man index 41ef47f35..913ac1384 100644 --- a/runtime/doc/vimdiff.man +++ b/runtime/doc/vimdiff.man @@ -3,19 +3,19 @@ VIMDIFF(1) VIMDIFF(1) NAME - vimdiff - edit two or three versions of a file with Vim and show dif- - ferences + vimdiff - edit two, three or four versions of a file with Vim and show + differences SYNOPSIS - vimdiff [options] file1 file2 [file3] + vimdiff [options] file1 file2 [file3 [file4]] 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 or four) 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. |