aboutsummaryrefslogtreecommitdiff
path: root/runtime/doc/manpages/vimdiff.1
diff options
context:
space:
mode:
authorStefan Hoffmann <stefan991@gmail.com>2014-07-31 14:21:11 +0200
committerStefan Hoffmann <stefan991@gmail.com>2014-09-20 14:03:14 +0200
commit9c8008e252a40bc79ae660989d0ee8e016ce228e (patch)
tree5d9fbf356153ec79347d7d93e43799dd92333ccc /runtime/doc/manpages/vimdiff.1
parent856e01e622db7e998d204d7f189563ae71bffbee (diff)
downloadrneovim-9c8008e252a40bc79ae660989d0ee8e016ce228e.tar.gz
rneovim-9c8008e252a40bc79ae660989d0ee8e016ce228e.tar.bz2
rneovim-9c8008e252a40bc79ae660989d0ee8e016ce228e.zip
doc: move manpages into their own folder
Diffstat (limited to 'runtime/doc/manpages/vimdiff.1')
-rw-r--r--runtime/doc/manpages/vimdiff.146
1 files changed, 46 insertions, 0 deletions
diff --git a/runtime/doc/manpages/vimdiff.1 b/runtime/doc/manpages/vimdiff.1
new file mode 100644
index 0000000000..bed2b32889
--- /dev/null
+++ b/runtime/doc/manpages/vimdiff.1
@@ -0,0 +1,46 @@
+.TH VIMDIFF 1 "2001 March 30"
+.SH NAME
+vimdiff \- edit two, three or four versions of a file with Vim and show differences
+.SH SYNOPSIS
+.br
+.B vimdiff
+[options] file1 file2 [file3 [file4]]
+.PP
+.B gvimdiff
+.SH DESCRIPTION
+.B Vimdiff
+starts
+.B 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.
+.PP
+See vim(1) for details about Vim itself.
+.PP
+When started as
+.B gvimdiff
+the GUI will be started, if available.
+.PP
+In each window the 'diff' option will be set, which causes the differences
+to be highlighted.
+.br
+The 'wrap' and 'scrollbind' options are set to make the text look good.
+.br
+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.
+.SH 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.
+.PP
+For all other arguments see vim(1).
+.SH SEE ALSO
+vim(1)
+.SH AUTHOR
+Most of
+.B Vim
+was made by Bram Moolenaar, with a lot of help from others.
+See ":help credits" in
+.B Vim.