From 0e4c1c54c48124fe25110484f6c50eb7e5b0c5e3 Mon Sep 17 00:00:00 2001
From: Ruslan <rtim@op8.fun>
Date: Fri, 24 Oct 2025 10:10:24 +0300
Subject: [PATCH] https://github.com/neovim/neovim/issues/22696

remove diffopt to avoid bad experience in 3-way merges
---
 lua/crentist/set.lua | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lua/crentist/set.lua b/lua/crentist/set.lua
index 312ce1f..de3c07c 100644
--- 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'
+