Mac Developer Library Developer
Search

 

This manual page is for Mac OS X version 10.9

If you are running a different version of Mac OS X, view the documentation locally:

  • In Terminal, using the man(1) command

Reading manual pages

Manual pages are intended as a quick reference for people who already understand a technology.

  • To learn how the manual is organized or to learn about command syntax, read the manual page for manpages(5).

  • For more information about this technology, look for other documentation in the Apple Developer Library.

  • For general information about writing shell scripts, read Shell Scripting Primer.



VIMDIFF(1)                                                                                        VIMDIFF(1)



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

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

       gvimdiff

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(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)

Reporting Problems

The way to report a problem with this manual page depends on the type of problem:

Content errors
Report errors in the content of this documentation with the feedback links below.
Bug reports
Report bugs in the functionality of the described tool or API through Bug Reporter.
Formatting problems
Report formatting mistakes in the online version of these pages with the feedback links below.

Feedback