chore(git): messing around with conflict highlight

Based on sindrets/diffview.nvim#546 at the very moment there's no way to
customize the diffs especially in conflicted files. Yes, there's plugin
called https://github.com/akinsho/git-conflict.nvim to help highlighting
conflict blocks but it superseeded by the `diffview.nvim`

Author: feryardiant

lua/plugins/git.lua

@@ -35,6 +35,21 @@ return {
     },
   },
 
+  {
+    'akinsho/git-conflict.nvim',
+    version = '*',
+    ---@module 'git-conflict'
+    ---@type GitConflictConfig
+    opts = {
+      disable_diagnostics = true,
+      highlights = {
+        ancestor = 'DiffText',
+        current = 'DiffChange',
+        incoming = 'DiffAdd',
+      },
+    },
+  },
+
   {
     'sindrets/diffview.nvim',
     dependencies = {

lua/plugins/init.lua

@@ -53,10 +53,10 @@ return {
         WinBarNC = { bg = 'none' },
         WinSeparator = { fg = colors.guide_normal, bg = 'none' },
 
-        DiffText = { link = 'DiffChange' },
+        -- DiffText = { link = 'DiffChange' },
         -- DiffAdd = { fg = colors.vcs_added },
         -- DiffChange = { bg = colors.selection_inactive },
-        DiffDelete = { fg = colors.vcs_removed },
+        -- DiffDelete = { fg = colors.vcs_removed },
 
         -- DiffviewDiffAdd = { fg = colors.vcs_added },
         DiffviewDiffDelete = { fg = colors.comment },