Mercurial > vim
diff runtime/doc/vimdiff.1 @ 24911:fd37be6dc258
Update runtime files
Commit: https://github.com/vim/vim/commit/2346a6378483c9871016f9fc821ec5cbea638f13
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jun 13 19:02:49 2021 +0200
Update runtime files
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sun, 13 Jun 2021 19:15:03 +0200 |
parents | f4f8014d516e |
children |
line wrap: on
line diff
--- a/runtime/doc/vimdiff.1 +++ b/runtime/doc/vimdiff.1 @@ -1,17 +1,17 @@ .TH VIMDIFF 1 "2001 March 30" .SH NAME -vimdiff \- edit two, three or four versions of a file with Vim and show differences +vimdiff \- edit between two and eight versions of a file with Vim and show differences .SH SYNOPSIS .br .B vimdiff -[options] file1 file2 [file3 [file4]] +[options] file1 file2 [file3 [file4 [file5 [file6 [file7 [file8]]]]]] .PP .B gvimdiff .SH DESCRIPTION .B Vimdiff starts .B Vim -on two (or three or four) files. +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