summaryrefslogtreecommitdiff
path: root/runtime/doc/diff.txt
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/diff.txt
parentda40c8536c2b7bdbd1d192ee1aa3045e2119675e (diff)
downloadvim-git-e37d50a5def1c0ff162392cd3f017059c458650c.tar.gz
updated for version 7.2c-000v7.2c.000
Diffstat (limited to 'runtime/doc/diff.txt')
-rw-r--r--runtime/doc/diff.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt
index 379f6a6be..2177c5698 100644
--- a/runtime/doc/diff.txt
+++ b/runtime/doc/diff.txt
@@ -1,12 +1,12 @@
-*diff.txt* For Vim version 7.2b. Last change: 2006 Oct 02
+*diff.txt* For Vim version 7.2c. Last change: 2008 Jul 21
VIM REFERENCE MANUAL by Bram Moolenaar
*diff* *vimdiff* *gvimdiff* *diff-mode*
-This file describes the +diff feature: Showing differences between two or
-three versions of the same file.
+This file describes the +diff feature: Showing differences between two,
+three or four versions of the same file.
The basics are explained in section |08.7| of the user manual.
@@ -49,7 +49,7 @@ What happens is that Vim opens a window for each of the files. This is like
using the |-O| argument. This uses vertical splits. If you prefer horizontal
splits add the |-o| argument: >
- vimdiff -o file1 file2 [file3]
+ vimdiff -o file1 file2 [file3 [file4]]
If you always prefer horizontal splits include "horizontal" in 'diffopt'.