https://github.com/neovim/neovim/issues/22696

remove diffopt to avoid bad experience in 3-way merges
2025-10-24 10:10:24 +03:00
parent 42ca780fac
commit 0e4c1c54c4
1 changed files with 2 additions and 0 deletions
--- a/lua/crentist/set.lua
+++ b/lua/crentist/set.lua
@@ -32,3 +32,5 @@ vim.opt.updatetime = 50
 vim.opt.colorcolumn = "80"
 vim.opt.diffopt = 'internal,filler,closeoff,algorithm:histogram'
`@@ -32,3 +32,5 @@ vim.opt.updatetime = 50`

	`vim.opt.colorcolumn = "80"`	`vim.opt.colorcolumn = "80"`

		`vim.opt.diffopt = 'internal,filler,closeoff,algorithm:histogram'`