Mercurial > vim
view runtime/doc/vimdiff.man @ 27020:0f2dd0d07071 v8.2.4039
patch 8.2.4039: the xdiff library is linked in even when not used
Commit: https://github.com/vim/vim/commit/67ffb417861a90fd2c1b215a42fd230272ed94cb
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jan 8 13:36:57 2022 +0000
patch 8.2.4039: the xdiff library is linked in even when not used
Problem: The xdiff library is linked in even when not used.
Solution: Use configure to decide whether xdiff object files are included.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sat, 08 Jan 2022 14:45:03 +0100 |
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)