view runtime/doc/vimdiff.man @ 33072:6028d7f701ce v9.0.1823

patch 9.0.1823: Autoconf 2.69 too old Commit: https://github.com/vim/vim/commit/a96d544bc355b1a6021feccf5fa2bd5659bc5269 Author: Illia Bobyr <illia.bobyr@gmail.com> Date: Wed Aug 30 16:30:15 2023 +0200 patch 9.0.1823: Autoconf 2.69 too old Problem: Autoconf 2.69 too old Solution: Migrate to Autoconf 2.71 Autoconf 2.69 is almost 10 years old. And 2.71 is also a few years old as well. Should be pretty well tested by now. It brings a lot of improvements and there seems to be an ongoing work on autoconf 2.72 already. This change just addresses two minor changes `autoupdate` suggested, and then `src/auto/configure` is regenerated by running cd src make AUTOCONF=autoconf2.71 autoconf closes: #12958 Signed-off-by: Christian Brabandt <cb@256bit.org> Co-authored-by: Illia Bobyr <illia.bobyr@gmail.com>
author Christian Brabandt <cb@256bit.org>
date Wed, 30 Aug 2023 16:45:05 +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)