annotate runtime/doc/vimdiff.1 @ 19477:2bb0e80fcd32 v8.2.0296

patch 8.2.0296: mixing up "long long" and __int64 may cause problems Commit: https://github.com/vim/vim/commit/f9706e9df0e37d214fb08eda30ba29627e97a607 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Feb 22 14:27:04 2020 +0100 patch 8.2.0296: mixing up "long long" and __int64 may cause problems Problem: Mixing up "long long" and __int64 may cause problems. (John Marriott) Solution: Pass varnumber_T to vim_snprintf(). Add v:numbersize.
author Bram Moolenaar <Bram@vim.org>
date Sat, 22 Feb 2020 14:30:04 +0100
parents f4f8014d516e
children fd37be6dc258
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1 .TH VIMDIFF 1 "2001 March 30"
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2 .SH NAME
1698
f4f8014d516e updated for version 7.2c-000
vimboss
parents: 289
diff changeset
3 vimdiff \- edit two, three or four versions of a file with Vim and show differences
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4 .SH SYNOPSIS
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5 .br
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6 .B vimdiff
1698
f4f8014d516e updated for version 7.2c-000
vimboss
parents: 289
diff changeset
7 [options] file1 file2 [file3 [file4]]
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8 .PP
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9 .B gvimdiff
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
10 .SH DESCRIPTION
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
11 .B Vimdiff
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
12 starts
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
13 .B Vim
1698
f4f8014d516e updated for version 7.2c-000
vimboss
parents: 289
diff changeset
14 on two (or three or four) files.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
15 Each file gets its own window.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
16 The differences between the files are highlighted.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
17 This is a nice way to inspect changes and to move changes from one version
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
18 to another version of the same file.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
19 .PP
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
20 See vim(1) for details about Vim itself.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
21 .PP
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
22 When started as
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
23 .B gvimdiff
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
24 the GUI will be started, if available.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
25 .PP
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
26 In each window the 'diff' option will be set, which causes the differences
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
27 to be highlighted.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
28 .br
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
29 The 'wrap' and 'scrollbind' options are set to make the text look good.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
30 .br
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
31 The 'foldmethod' option is set to "diff", which puts ranges of lines without
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
32 changes in a fold. 'foldcolumn' is set to two to make it easy to spot the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
33 folds and open or close them.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
34 .SH OPTIONS
231
8eec9649b7a2 updated for version 7.0064
vimboss
parents: 7
diff changeset
35 Vertical splits are used to align the lines, as if the "\-O" argument was used.
289
9a10e4d195b3 updated for version 7.0076
vimboss
parents: 231
diff changeset
36 To use horizontal splits instead, use the "\-o" argument.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
37 .PP
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
38 For all other arguments see vim(1).
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
39 .SH SEE ALSO
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
40 vim(1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
41 .SH AUTHOR
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
42 Most of
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
43 .B Vim
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
44 was made by Bram Moolenaar, with a lot of help from others.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
45 See ":help credits" in
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
46 .B Vim.