Mercurial > vim

comparison runtime/doc/vimdiff.man @ 1698:f4f8014d516e v7.2c.000

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.2c-000
author vimboss
date Wed, 06 Aug 2008 17:06:04 +0000
parents d2bc505a6d91
children fd37be6dc258
comparison
equal deleted inserted replaced
1697:2f9308b31181 1698:f4f8014d516e
1 VIMDIFF(1) VIMDIFF(1) 1 VIMDIFF(1) VIMDIFF(1)
2 2
3 3
4 4
5 NAME 5 NAME
6 vimdiff - edit two or three versions of a file with Vim and show dif- 6 vimdiff - edit two, three or four versions of a file with Vim and show
7 ferences 7 differences
8 8
9 SYNOPSIS 9 SYNOPSIS
10 vimdiff [options] file1 file2 [file3] 10 vimdiff [options] file1 file2 [file3 [file4]]
11 11
12 gvimdiff 12 gvimdiff
13 13
14 DESCRIPTION 14 DESCRIPTION
15 Vimdiff starts Vim on two (or three) files. Each file gets its own 15 Vimdiff starts Vim on two (or three or four) files. Each file gets its
16 window. The differences between the files are highlighted. This is a 16 own window. The differences between the files are highlighted. This
17 nice way to inspect changes and to move changes from one version to 17 is a nice way to inspect changes and to move changes from one version
18 another version of the same file. 18 to another version of the same file.
19 19
20 See vim(1) for details about Vim itself. 20 See vim(1) for details about Vim itself.
21 21
22 When started as gvimdiff the GUI will be started, if available. 22 When started as gvimdiff the GUI will be started, if available.
23 23