Mercurial > vim
view runtime/doc/vimdiff.1 @ 33238:6c1d29d45734 v9.0.1892
patch 9.0.1892: CI: no FreeBSD 14 support
Commit: https://github.com/vim/vim/commit/24a95f42b8469944a1e74838438ac8f1d86f9450
Author: Philip H <47042125+pheiduck@users.noreply.github.com>
Date: Sun Sep 10 18:31:51 2023 +0200
patch 9.0.1892: CI: no FreeBSD 14 support
Problem: CI: no FreeBSD 14 support
Solution: Drop support for FreeBSD 12, add FreeBSD 14
closes: #13059
Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Philip H <47042125+pheiduck@users.noreply.github.com>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sun, 10 Sep 2023 18:45:03 +0200 |
parents | fd37be6dc258 |
children | 4a958ef2dc5e |
line wrap: on
line source
.TH VIMDIFF 1 "2001 March 30" .SH NAME vimdiff \- edit between two and eight versions of a file with Vim and show differences .SH SYNOPSIS .br .B vimdiff [options] file1 file2 [file3 [file4 [file5 [file6 [file7 [file8]]]]]] .PP .B gvimdiff .SH DESCRIPTION .B Vimdiff starts .B 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 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.