view runtime/doc/vimdiff.man @ 12849:de80fb313baf v8.0.1301

patch 8.0.1301: generated license file for NSIS has a modeline commit https://github.com/vim/vim/commit/7cb769a69f5b9d6951f4427c85e75f5b2909cf10 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Nov 16 17:36:02 2017 +0100 patch 8.0.1301: generated license file for NSIS has a modeline Problem: Generated license file for NSIS has a modeline. Solution: Adjust the pattern for sed. (Ken Takata)
author Christian Brabandt <cb@256bit.org>
date Thu, 16 Nov 2017 17:45:04 +0100
parents f4f8014d516e
children fd37be6dc258
line wrap: on
line source

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