From 5e0cc3921031b25e5ba724b6496458eebf425aa7 Mon Sep 17 00:00:00 2001
From: yetone <yetoneful@gmail.com>
Date: Mon, 24 Mar 2025 18:19:17 +0800
Subject: [PATCH] fix: special handling wehn vim diff count_a is 0 (#1698)

---
 lua/avante/sidebar.lua | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lua/avante/sidebar.lua b/lua/avante/sidebar.lua
index 77786b2..9f268c2 100644
--- a/lua/avante/sidebar.lua
+++ b/lua/avante/sidebar.lua
@@ -837,10 +837,6 @@ 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 result = {}
     table.insert(result, "<<<<<<< HEAD")