aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/options.lua
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2018-12-09 23:00:03 +0100
committerJustin M. Keyes <justinkz@gmail.com>2018-12-09 23:07:28 +0100
commit20620bae76deddd892df2d33f9e745efd5d8598b (patch)
tree8c43e2387210e7a561dad08b2cda8e0370f0eb72 /src/nvim/options.lua
parent857a7312d015350c9637548310c7a187637d3ca4 (diff)
parent4e2981081796c8618caa4bed30d12e1e8fc8ae08 (diff)
downloadrneovim-20620bae76deddd892df2d33f9e745efd5d8598b.tar.gz
rneovim-20620bae76deddd892df2d33f9e745efd5d8598b.tar.bz2
rneovim-20620bae76deddd892df2d33f9e745efd5d8598b.zip
Merge #9306 'vim-patch: integrate xdiff library'
closes #1466 closes #1007 closes #1391
Diffstat (limited to 'src/nvim/options.lua')
-rw-r--r--src/nvim/options.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nvim/options.lua b/src/nvim/options.lua
index b0575df7ec..0cc6f58c5f 100644
--- a/src/nvim/options.lua
+++ b/src/nvim/options.lua
@@ -615,7 +615,7 @@ return {
alloced=true,
redraw={'current_window'},
varname='p_dip',
- defaults={if_true={vi="filler"}}
+ defaults={if_true={vi="internal,filler"}}
},
{
full_name='digraph', abbreviation='dg',