aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-29 04:34:16 -04:00
Code Activity

updated for version 7.0066

Browse Source
This commit is contained in:
Bram Moolenaar
2005-04-15 21:00:38 +00:00
parent 4499d2ee58
commit 402d2fea70
89 changed files with 6389 additions and 928 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
runtime/doc/vimdiff.man
View File

@@ -1,12 +1,10 @@
VIMDIFF(1) VIMDIFF(1)
VIMDIFF(1) VIMDIFF(1)
NAME
vimdiff - edit two or three versions of a file with Vim
and show differences
vimdiff - edit two or three versions of a file with Vim and show dif-
ferences
SYNOPSIS
vimdiff [options] file1 file2 [file3]
@@ -14,30 +12,25 @@ SYNOPSIS
gvimdiff
DESCRIPTION
Vimdiff starts Vim on two (or three) 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.
Vimdiff starts Vim on two (or three) 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.
See vim(1) for details about Vim itself.
When started as gvimdiff the GUI will be started, if
available.
When started as gvimdiff the GUI will be started, if available.
In each window the 'diff' option will be set, which causes
the differences 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.
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 intead,
use the "-o" argument.
Vertical splits are used to align the lines, as if the "-O" argument
was used. To use horizontal splits intead, use the "-o" argument.
For all other arguments see vim(1).
@@ -45,22 +38,9 @@ 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.
Most of Vim was made by Bram Moolenaar, with a lot of help from others.
See ":help credits" in Vim.
2001 March 30 1
2001 March 30 VIMDIFF(1)