Mercurial > vim
view runtime/doc/vimdiff.1 @ 31665:8492bbc9f533 v9.0.1165
patch 9.0.1165: tests using IPv6 sometimes fail
Commit: https://github.com/vim/vim/commit/765d82a657c5e42d5d7c88ae410e53f398c34c43
Author: James McCoy <jamessan@jamessan.com>
Date: Mon Jan 9 16:25:59 2023 +0000
patch 9.0.1165: tests using IPv6 sometimes fail
Problem: Tests using IPv6 sometimes fail.
Solution: Use getaddrinfo() and use try/catch. (James McCoy,
closes #11783)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Mon, 09 Jan 2023 17:30:07 +0100 |
parents | fd37be6dc258 |
children |
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.