Mercurial > vim
view runtime/doc/vimdiff.man @ 28879:73d490493dc6 v8.2.4962
patch 8.2.4962: files show up in git status
Commit: https://github.com/vim/vim/commit/5a8fad32ea9c075f045b37d6c7739891d458f82b
Author: shane.xb.qian <shane.qian@foxmail.com>
Date: Mon May 16 11:14:09 2022 +0100
patch 8.2.4962: files show up in git status
Problem: Files show up in git status.
Solution: Adjust the list of ignored files. Clean up more test files.
(Shane xb Qian, closes #9929)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Mon, 16 May 2022 12:15:04 +0200 |
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)