Mercurial > vim

view runtime/doc/vimdiff.man @ 25597:0fdacd8f0cf3 v8.2.3335

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.3335: Vim9: not enough tests run with Vim9 Commit: https://github.com/vim/vim/commit/ef98257593a0abf1300d0f70358dc45a70a62580 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Aug 12 19:27:57 2021 +0200 patch 8.2.3335: Vim9: not enough tests run with Vim9 Problem: Vim9: not enough tests run with Vim9. Solution: Run a few more tests in Vim9 script and :def function. Fix that items(), keys() and values9) return zero for a NULL dict. Make join() return an empty string for a NULL list. Make sort() return an empty list for a NULL list.
author Bram Moolenaar <Bram@vim.org>
date Thu, 12 Aug 2021 19:30:03 +0200
parents fd37be6dc258
children 4a958ef2dc5e
line wrap: on
line source

VIMDIFF(1)                  General Commands Manual                 VIMDIFF(1)



NAME
       vimdiff  -  edit  between two and eight versions of a file with Vim and
       show differences

SYNOPSIS
       vimdiff [options]  file1  file2  [file3  [file4  [file5  [file6  [file7
       [file8]]]]]]

       gvimdiff

DESCRIPTION
       Vimdiff  starts  Vim  on two up to eight 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 an‐
       other 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)