100 lines
2.4 KiB
HTML
100 lines
2.4 KiB
HTML
|
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
|
|
<HTML><HEAD><TITLE>Man page of VIMDIFF</TITLE>
|
|
</HEAD><BODY>
|
|
<H1>VIMDIFF</H1>
|
|
Section: User Commands (1)<BR>Updated: 2001 March 30<BR><A HREF="#index">Index</A>
|
|
<A HREF="/cgi-bin/man/man2html">Return to Main Contents</A><HR>
|
|
|
|
<A NAME="lbAB"> </A>
|
|
<H2>NAME</H2>
|
|
|
|
vimdiff - edit two, three or four versions of a file with Vim and show differences
|
|
<A NAME="lbAC"> </A>
|
|
<H2>SYNOPSIS</H2>
|
|
|
|
<BR>
|
|
|
|
<B>vimdiff</B>
|
|
|
|
[options] file1 file2 [file3 [file4]]
|
|
<P>
|
|
|
|
<B>gvimdiff</B>
|
|
|
|
<A NAME="lbAD"> </A>
|
|
<H2>DESCRIPTION</H2>
|
|
|
|
<B>Vimdiff</B>
|
|
|
|
starts
|
|
<B>Vim</B>
|
|
|
|
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.
|
|
<P>
|
|
|
|
See <A HREF="/cgi-bin/man/man2html?1+vim">vim</A>(1) for details about Vim itself.
|
|
<P>
|
|
|
|
When started as
|
|
<B>gvimdiff</B>
|
|
|
|
the GUI will be started, if available.
|
|
<P>
|
|
|
|
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.
|
|
<A NAME="lbAE"> </A>
|
|
<H2>OPTIONS</H2>
|
|
|
|
Vertical splits are used to align the lines, as if the "-O" argument was used.
|
|
To use horizontal splits instead, use the "-o" argument.
|
|
<P>
|
|
|
|
For all other arguments see <A HREF="/cgi-bin/man/man2html?1+vim">vim</A>(1).
|
|
<A NAME="lbAF"> </A>
|
|
<H2>SEE ALSO</H2>
|
|
|
|
<A HREF="/cgi-bin/man/man2html?1+vim">vim</A>(1)
|
|
<A NAME="lbAG"> </A>
|
|
<H2>AUTHOR</H2>
|
|
|
|
Most of
|
|
<B>Vim</B>
|
|
|
|
was made by Bram Moolenaar, with a lot of help from others.
|
|
See ":help credits" in
|
|
<B>Vim.</B>
|
|
|
|
<P>
|
|
|
|
<HR>
|
|
<A NAME="index"> </A><H2>Index</H2>
|
|
<DL>
|
|
<DT id="1"><A HREF="#lbAB">NAME</A><DD>
|
|
<DT id="2"><A HREF="#lbAC">SYNOPSIS</A><DD>
|
|
<DT id="3"><A HREF="#lbAD">DESCRIPTION</A><DD>
|
|
<DT id="4"><A HREF="#lbAE">OPTIONS</A><DD>
|
|
<DT id="5"><A HREF="#lbAF">SEE ALSO</A><DD>
|
|
<DT id="6"><A HREF="#lbAG">AUTHOR</A><DD>
|
|
</DL>
|
|
<HR>
|
|
This document was created by
|
|
<A HREF="/cgi-bin/man/man2html">man2html</A>,
|
|
using the manual pages.<BR>
|
|
Time: 00:05:29 GMT, March 31, 2021
|
|
</BODY>
|
|
</HTML>
|