summaryrefslogtreecommitdiff
path: root/runtime/doc/vimdiff.1
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2008-08-06 17:06:04 +0000
committerBram Moolenaar <Bram@vim.org>2008-08-06 17:06:04 +0000
commite37d50a5def1c0ff162392cd3f017059c458650c (patch)
treee7d1e2b17976b130d1283d33b091baf30cfc5d2c /runtime/doc/vimdiff.1
parentda40c8536c2b7bdbd1d192ee1aa3045e2119675e (diff)
downloadvim-git-e37d50a5def1c0ff162392cd3f017059c458650c.tar.gz
updated for version 7.2c-000v7.2c.000
Diffstat (limited to 'runtime/doc/vimdiff.1')
-rw-r--r--runtime/doc/vimdiff.16
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/doc/vimdiff.1 b/runtime/doc/vimdiff.1
index 90ed8b800..bed2b3288 100644
--- a/runtime/doc/vimdiff.1
+++ b/runtime/doc/vimdiff.1
@@ -1,17 +1,17 @@
.TH VIMDIFF 1 "2001 March 30"
.SH NAME
-vimdiff \- edit two or three versions of a file with Vim and show differences
+vimdiff \- edit two, three or four versions of a file with Vim and show differences
.SH SYNOPSIS
.br
.B vimdiff
-[options] file1 file2 [file3]
+[options] file1 file2 [file3 [file4]]
.PP
.B gvimdiff
.SH DESCRIPTION
.B Vimdiff
starts
.B Vim
-on two (or three) files.
+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