view runtime/doc/vimdiff.1 @ 25192:0588ea998908 v8.2.3132

patch 8.2.3132: compiler warns for size_t to colnr_T conversion. Commit: https://github.com/vim/vim/commit/6bcb18253a392cf75d3784953ef9c71de7af9019 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Jul 9 15:54:00 2021 +0200 patch 8.2.3132: compiler warns for size_t to colnr_T conversion. Problem: Compiler warns for size_t to colnr_T conversion. (Randall W. Morris) Solution: Add a type cast.
author Bram Moolenaar <Bram@vim.org>
date Fri, 09 Jul 2021 16:00:05 +0200
parents fd37be6dc258
children
line wrap: on
line source

.TH VIMDIFF 1 "2001 March 30"
.SH NAME
vimdiff \- edit between two and eight versions of a file with Vim and show differences
.SH SYNOPSIS
.br
.B vimdiff
[options] file1 file2 [file3 [file4 [file5 [file6 [file7 [file8]]]]]]
.PP
.B gvimdiff
.SH DESCRIPTION
.B Vimdiff
starts
.B Vim
on two up to eight 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.
.PP
See vim(1) for details about Vim itself.
.PP
When started as
.B gvimdiff
the GUI will be started, if available.
.PP
In each window the 'diff' option will be set, which causes the differences
to be highlighted.
.br
The 'wrap' and 'scrollbind' options are set to make the text look good.
.br
The 'foldmethod' option is set to "diff", which puts ranges of lines without
changes in a fold.  'foldcolumn' is set to two to make it easy to spot the
folds and open or close them.
.SH OPTIONS
Vertical splits are used to align the lines, as if the "\-O" argument was used.
To use horizontal splits instead, use the "\-o" argument.
.PP
For all other arguments see vim(1).
.SH SEE ALSO
vim(1)
.SH AUTHOR
Most of
.B Vim
was made by Bram Moolenaar, with a lot of help from others.
See ":help credits" in
.B Vim.