Mercurial > vim
view runtime/doc/vimdiff.1 @ 21540:8e278698b1fe v8.2.1320
patch 8.2.1320: Vim9: cannot declare some single letter variables
Commit: https://github.com/vim/vim/commit/33afa2447bdb0bdd15253c69a2cf6f9903685815
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Jul 29 19:18:00 2020 +0200
patch 8.2.1320: Vim9: cannot declare some single letter variables
Problem: Vim9: cannot declare some single letter variables.
Solution: Do not recognize a colon for a namespace for single letter
variables. (closes #6547)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Wed, 29 Jul 2020 19:30:04 +0200 |
parents | f4f8014d516e |
children | fd37be6dc258 |
line wrap: on
line source
.TH VIMDIFF 1 "2001 March 30" .SH NAME vimdiff \- edit two, three or four versions of a file with Vim and show differences .SH SYNOPSIS .br .B vimdiff [options] file1 file2 [file3 [file4]] .PP .B gvimdiff .SH DESCRIPTION .B Vimdiff starts .B Vim on two (or three or four) 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.