Mercurial > vim
view runtime/doc/vimdiff.1 @ 10783:04eb70c77cf4 v8.0.0281
patch 8.0.0281: some files are still using ARGSUSED instead of UNUSED
commit https://github.com/vim/vim/commit/1266d678bf2ed5072cca9381409536406f8d7b32
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Feb 1 13:43:36 2017 +0100
patch 8.0.0281: some files are still using ARGSUSED instead of UNUSED
Problem: MS-Windows files are still using ARGSUSED while most other files
have UNUSED.
Solution: Change ARGSUSED to UNUSED or delete it.
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Wed, 01 Feb 2017 13:45:04 +0100 |
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.