view runtime/doc/vimdiff.1 @ 27037:a0a37337428a v8.2.4047

patch 8.2.4047: depending on the build features error messages are unused Commit: https://github.com/vim/vim/commit/f85a424c832777892c4efaff163c2fa710ce8d91 Author: Dominique Pelle <dominique.pelle@gmail.com> Date: Sun Jan 9 12:49:31 2022 +0000 patch 8.2.4047: depending on the build features error messages are unused Problem: Depending on the build features error messages are unused. Solution: Add #ifdefs. (Dominique Pell?, closes https://github.com/vim/vim/issues/9493)
author Bram Moolenaar <Bram@vim.org>
date Sun, 09 Jan 2022 14:00:04 +0100
parents fd37be6dc258
children 4a958ef2dc5e
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.