Mercurial > vim
view runtime/doc/vimdiff.1 @ 20437:3bb4dea4a164 v8.2.0773
patch 8.2.0773: switching to raw mode every time ":" is used
Commit: https://github.com/vim/vim/commit/3b1f18f785f67c6cd110498c366e4d0c0fe11f27
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat May 16 23:15:08 2020 +0200
patch 8.2.0773: switching to raw mode every time ":" is used
Problem: Switching to raw mode every time ":" is used.
Solution: When executing a shell set cur_tmode to TMODE_UNKNOWN, so that the
next time TMODE_RAW is used it is set, but not every time.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sat, 16 May 2020 23:30:03 +0200 |
parents | f4f8014d516e |
children | fd37be6dc258 |
line wrap: on
line source
.TH VIMDIFF 1 "2001 March 30" .SH NAME vimdiff \- edit two, three or four versions of a file with Vim and show differences .SH SYNOPSIS .br .B vimdiff [options] file1 file2 [file3 [file4]] .PP .B gvimdiff .SH DESCRIPTION .B Vimdiff starts .B Vim on two (or three or four) 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.