vimdiff

edit two, three or four versions of a file with Vim and show differences

Synopsis

vimdiff [options] file1 file2 [file3 [file4]]

gvimdiff

add an example, a script, a trick and tips

: email address (won't be displayed)
: name

Step 2

Thanks for this example ! - It will be moderated and published shortly.

Feel free to post other examples Oops ! There is a tiny cockup. A damn 404 cockup. Please contact the loosy team who maintains and develops this wonderful site by clicking in the mighty feedback button on the side of the page. Say what happened. Thanks!

examples

source

            
  vimdiff "$2" "$5"

source

Program/script to 'walk' through svn revision history

svn log -q -v filename and processing output for revlist

svn diff -c M filename for changes in filename in revision M

description

Vimdiff starts 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.

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 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.

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

author

Most of Vim was made by Bram Moolenaar, with a lot of help from others. See ":help credits" in Vim.