Mercurial > vim
view runtime/doc/vimdiff.man @ 7637:81f94c1e2e4d v7.4.1118
commit https://github.com/vim/vim/commit/a99b90437af730dcafd9143c0942c87777a00d52
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jan 17 17:10:59 2016 +0100
patch 7.4.1118
Problem: Tests hang in 24 line terminal.
Solution: Set the 'more' option off.
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sun, 17 Jan 2016 17:15:05 +0100 |
parents | f4f8014d516e |
children | fd37be6dc258 |
line wrap: on
line source
VIMDIFF(1) VIMDIFF(1) NAME vimdiff - edit two, three or four versions of a file with Vim and show differences SYNOPSIS vimdiff [options] file1 file2 [file3 [file4]] gvimdiff DESCRIPTION Vimdiff starts 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. See vim(1) for details about Vim itself. When started as gvimdiff the GUI will be started, if available. In each window the 'diff' option will be set, which causes the differ- ences to be highlighted. The 'wrap' and 'scrollbind' options are set to make the text look good. 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. 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. For all other arguments see vim(1). SEE ALSO vim(1) AUTHOR Most of Vim was made by Bram Moolenaar, with a lot of help from others. See ":help credits" in Vim. 2001 March 30 VIMDIFF(1)