Skip to content

refactor!: remove conflict.enabled #478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
barrettruth merged 3 commits into from
Nov 8, 2026
Merged

refactor!: remove conflict.enabled #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f4d19d5
fix: respect deprecated conflict.enabled configuration
barrettruth Nov 8, 2026
01ea25c
refactor!: remove deprecated conflict.enabled support
barrettruth Nov 8, 2026
9752f14
refactor!: remove conflict enabled handling
barrettruth Nov 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions doc/diffs.nvim.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,8 @@ Configuration is done via `vim.g.diffs`. Set options before the plugin loads:

{conflict} (boolean|table, default: true)
Highlight and resolve inline merge conflicts.
Set to false to disable.
See |diffs.nvim-conflict|.

*diffs.nvim.Highlights*
Highlights table fields: ~
Expand Down Expand Up @@ -1046,13 +1048,15 @@ unchanged.
==============================================================================
CONFLICT RESOLUTION *diffs.nvim-conflict*

diffs.nvim detects inline merge conflict markers (`<<<<<<<`/`=======`/
`>>>>>>>`) in working files and provides highlighting and resolution actions.
Both standard and diff3 (`|||||||`) formats are supported.
diffs.nvim highlights merge conflicts in working files. It recognizes standard
markers (`<<<<<<<`, `=======`, `>>>>>>>`) and diff3 base sections (`|||||||`).

Conflict regions are detected automatically on `BufReadPost` and re-scanned on
`TextChanged`. When all conflicts in a buffer are resolved, highlighting is
removed.
diffs.nvim detects conflicts when you open a file and updates their highlights
as you edit. Resolve conflicts with the mappings below or edit the text directly.

To disable conflict handling: >lua
vim.g.diffs = { conflict = false }
<

Buffer-local mappings: ~ *diffs.nvim-conflict-keymaps*

Expand Down
13 changes: 0 additions & 13 deletions lua/diffs/config.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ local integration_metadata = require('diffs.integrations')
---@field prev string|false

---@class diffs.ConflictConfig
---@field enabled? boolean Deprecated.
---@field keymaps diffs.ConflictKeymaps|false

---@class diffs.DifftasticConfig
Expand Down Expand Up @@ -158,18 +157,6 @@ function M.new(opts)
end
end
end
if type(result.conflict) == 'table' and result.conflict.enabled ~= nil then
vim.notify_once(
'[diffs]: conflict.enabled is deprecated. Support ends on November 30, 2026. '
.. 'Use conflict = false to disable conflict handling. Otherwise remove enabled.',
vim.log.levels.WARN
)
if result.conflict.enabled == false then
result.conflict = false
else
result.conflict.enabled = nil
end
end
if result.conflict == true then
result.conflict = vim.deepcopy(DEFAULTS.conflict)
end
Expand Down
Loading