From 788f5207c44cc858a3ff06450b950cf7d6fd2ee0 Mon Sep 17 00:00:00 2001
From: Barrett Ruth <br@barrettruth.com>
Date: Sun, 8 Nov 2026 15:21:02 -0600
Subject: [PATCH 1/2] fix: warn about ignored conflict and view settings

---
 lua/diffs/config.lua | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/lua/diffs/config.lua b/lua/diffs/config.lua
index 0ac2b6a..6cb5773 100644
--- a/lua/diffs/config.lua
+++ b/lua/diffs/config.lua
@@ -184,6 +184,25 @@ function M.new(opts)
     integrations = integration_metadata.normalize(opts and opts.integrations),
   })
   M.validate(opts)
+  for group, keys in pairs({
+    conflict = { 'disable_diagnostics', 'show_virtual_text', 'format_virtual_text', 'show_actions' },
+    view = { 'change_bar', 'rail_separator' },
+  }) do
+    if type(opts[group]) == 'table' then
+      for _, key in ipairs(keys) do
+        if opts[group][key] ~= nil then
+          vim.notify_once(
+            '[diffs]: '
+              .. group
+              .. '.'
+              .. key
+              .. ' was removed and is ignored. Remove it from the configuration.',
+            vim.log.levels.WARN
+          )
+        end
+      end
+    end
+  end
   if opts.highlights and type(opts.highlights.intra) == 'boolean' then
     vim.notify_once(
       '[diffs]: Boolean highlights.intra is deprecated. Support ends on November 30, 2026. '

From 21c35867eb407d263da063a66d0b506b7c7f6e4a Mon Sep 17 00:00:00 2001
From: Barrett Ruth <br@barrettruth.com>
Date: Sun, 8 Nov 2026 15:21:52 -0600
Subject: [PATCH 2/2] refactor: remove obsolete conflict and view option
 warnings

---
 lua/diffs/config.lua | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/lua/diffs/config.lua b/lua/diffs/config.lua
index 6cb5773..0ac2b6a 100644
--- a/lua/diffs/config.lua
+++ b/lua/diffs/config.lua
@@ -184,25 +184,6 @@ function M.new(opts)
     integrations = integration_metadata.normalize(opts and opts.integrations),
   })
   M.validate(opts)
-  for group, keys in pairs({
-    conflict = { 'disable_diagnostics', 'show_virtual_text', 'format_virtual_text', 'show_actions' },
-    view = { 'change_bar', 'rail_separator' },
-  }) do
-    if type(opts[group]) == 'table' then
-      for _, key in ipairs(keys) do
-        if opts[group][key] ~= nil then
-          vim.notify_once(
-            '[diffs]: '
-              .. group
-              .. '.'
-              .. key
-              .. ' was removed and is ignored. Remove it from the configuration.',
-            vim.log.levels.WARN
-          )
-        end
-      end
-    end
-  end
   if opts.highlights and type(opts.highlights.intra) == 'boolean' then
     vim.notify_once(
       '[diffs]: Boolean highlights.intra is deprecated. Support ends on November 30, 2026. '