aboutsummaryrefslogtreecommitdiff
path: root/runtime
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2018-08-12 13:05:59 +0200
committerGitHub <noreply@github.com>2018-08-12 13:05:59 +0200
commitae24c9b27016a841121b1a01664b748b0a5cbeb7 (patch)
tree9c44b75a3cffe6bbf7bbd8261267ed60f1c6b997 /runtime
parent47f9ab46357e7f0cbd0c7f475ade01c2c26aac47 (diff)
parent3d77ca39c70446ed63a54ee286688c394826511c (diff)
downloadrneovim-ae24c9b27016a841121b1a01664b748b0a5cbeb7.tar.gz
rneovim-ae24c9b27016a841121b1a01664b748b0a5cbeb7.tar.bz2
rneovim-ae24c9b27016a841121b1a01664b748b0a5cbeb7.zip
Merge #8847 from janlazo/vim-8.0.1037
Diffstat (limited to 'runtime')
-rw-r--r--runtime/doc/options.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 81726ca46b..cdec599a74 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1960,6 +1960,9 @@ A jump table for the options with a short description can be found at |Q_op|.
vertical Start diff mode with vertical splits (unless
explicitly specified otherwise).
+ hiddenoff Do not use diff mode for a buffer when it
+ becomes hidden.
+
foldcolumn:{n} Set the 'foldcolumn' option to {n} when
starting diff mode. Without this 2 is used.