Skip to content

Commit

Permalink
fix: diff insert (yetone#893)
Browse files Browse the repository at this point in the history
  • Loading branch information
yetone authored Nov 23, 2024
1 parent 67e946e commit 5e6d336
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions lua/avante/sidebar.lua
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,10 @@ local function insert_conflict_contents(bufnr, snippets)

for _, snippet in ipairs(snippets) do
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 need_prepend_indentation = false
local start_line_indentation = ""
Expand Down

0 comments on commit 5e6d336

Please sign in to comment.