Mercurial > vim
view runtime/doc/vimdiff.man @ 26540:682ff45f289f v8.2.3799
patch 8.2.3799: edit test hangs or fails
Commit: https://github.com/vim/vim/commit/80d60910ff493f7b8ea52156e4c7df7e70a348c6
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Dec 13 19:14:52 2021 +0000
patch 8.2.3799: edit test hangs or fails
Problem: Edit test hangs or fails.
Solution: Do not rethrow an exception when inside try/catch.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Mon, 13 Dec 2021 20:15:03 +0100 |
parents | fd37be6dc258 |
children | 4a958ef2dc5e |
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)