Mercurial > vim
view runtime/doc/vimdiff.man @ 29247:5f314b2ed494 v8.2.5142
patch 8.2.5142: startup test fails if there is a status bar
Commit: https://github.com/vim/vim/commit/fa04eae5a5b9394079bde2d37ce6f9f8a5567d48
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Jun 21 14:38:40 2022 +0100
patch 8.2.5142: startup test fails if there is a status bar
Problem: Startup test fails if there is a status bar at the top of the
screen. (Ernie Rael)
Solution: Use a larger vertical offset in the test.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Tue, 21 Jun 2022 18:45:07 +0200 |
parents | fd37be6dc258 |
children |
line wrap: on
line source
VIMDIFF(1) General Commands Manual VIMDIFF(1) NAME vimdiff - edit between two and eight versions of a file with Vim and show differences SYNOPSIS vimdiff [options] file1 file2 [file3 [file4 [file5 [file6 [file7 [file8]]]]]] gvimdiff DESCRIPTION Vimdiff starts 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 an‐ other 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)