summaryrefslogtreecommitdiff
path: root/runtime
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-09-10 21:15:40 +0200
committerBram Moolenaar <Bram@vim.org>2018-09-10 21:15:40 +0200
commitc93262b2e3fb043c685bd4014a35a29111dea484 (patch)
tree11cdf6eb664b9164279d70f7ea3bdcd10bd5517a /runtime
parentf29c1c6aa3f365c025890fab5fb9efbe88eb1761 (diff)
downloadvim-git-c93262b2e3fb043c685bd4014a35a29111dea484.tar.gz
patch 8.1.0363: internal diff isn't used by default as advertisedv8.1.0363
Problem: Internal diff isn't used by default as advertised. Solution: Add "internal" to the default value of 'diffopt'. Also add couple of files missing from the distribution.
Diffstat (limited to 'runtime')
-rw-r--r--runtime/doc/options.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 16aa42215..a02618af4 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -2615,7 +2615,7 @@ A jump table for the options with a short description can be found at |Q_op|.
security reasons.
*'dip'* *'diffopt'*
-'diffopt' 'dip' string (default "filler")
+'diffopt' 'dip' string (default "internal,filler")
global
{not in Vi}
{not available when compiled without the |+diff|