barrett/diffs.nvim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 13

fix: remove unused function and import flagged by selene

Browse source
This commit is contained in:
Barrett Ruth 2026-02-08 18:00:22 -05:00
parent adf3703f04
commit 92209721c8
2 changed files with 0 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lua/diffs/merge.lua
View file

@ -147,24 +147,6 @@ local function add_resolved_virtual_text(diff_bufnr, hunk)
})
end
---@param diff_bufnr integer
---@param hunk diffs.MergeHunkInfo
---@param working_bufnr integer
---@param replacement string[]
---@param config diffs.ConflictConfig
local function do_resolve(diff_bufnr, hunk, working_bufnr, replacement, config)
local region = M.match_hunk_to_conflict(hunk, working_bufnr)
if not region then
vim.notify('[diffs.nvim]: hunk does not correspond to a conflict region', vim.log.levels.INFO)
return
end
conflict.replace_region(working_bufnr, region, replacement)
conflict.refresh(working_bufnr, config)
mark_resolved(diff_bufnr, hunk.index)
add_resolved_virtual_text(diff_bufnr, hunk)
end
---@param bufnr integer
---@param config diffs.ConflictConfig
function M.resolve_ours(bufnr, config)

1
spec/merge_spec.lua
View file

@ -1,4 +1,3 @@
local conflict = require('diffs.conflict')
local helpers = require('spec.helpers')
local merge = require('diffs.merge')