CarGDev/avante.nvim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: special handling wehn vim diff count_a is 0 (#1698)

Browse Source
This commit is contained in:
yetone
2025-03-24 18:19:17 +08:00
committed by GitHub
parent e33d648d71
commit 5e0cc39210
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lua/avante/sidebar.lua
View File

@@ -837,10 +837,6 @@ local function insert_conflict_contents(bufnr, snippets)
for _, snippet in ipairs(snippets) do for _, snippet in ipairs(snippets) do
local start_line, end_line = unpack(snippet.range) local start_line, end_line = unpack(snippet.range)
if start_line > end_line then
start_line = start_line + 1
end_line = end_line + 1
end
local result = {} local result = {}
table.insert(result, "<<<<<<< HEAD") table.insert(result, "<<<<<<< HEAD")