view runtime/doc/vimdiff.1 @ 25445:65f04b6effd5 v8.2.3259

patch 8.2.3259: when 'indentexpr' causes an error did_throw may hang Commit: https://github.com/vim/vim/commit/620c959c6c00e469c4d3b1ab2e08e4767ee142a4 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jul 31 21:32:31 2021 +0200 patch 8.2.3259: when 'indentexpr' causes an error did_throw may hang Problem: When 'indentexpr' causes an error the did_throw flag may remain set. Solution: Reset did_throw and show the error. (closes #8677)
author Bram Moolenaar <Bram@vim.org>
date Sat, 31 Jul 2021 21:45:04 +0200
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.