From 674409573bc1bfecc803304e6e7362b84386db72 Mon Sep 17 00:00:00 2001
From: Sanchayan Maity <sanchayan@sanchayanmaity.net>
Date: Tue, 17 Jan 2023 09:21:53 +0530
Subject: [PATCH] git/nvim: Drop diffconflicts

See the discussion on
https://github.com/whiteinge/diffconflicts/issues/26

Also
https://www.eseth.org/2020/mergetools.html
---
 git/.gitconfig                    | 3 +++
 nvim/.config/nvim/lua/plugins.lua | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/git/.gitconfig b/git/.gitconfig
index 44d2b9a..3e106ce 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -41,6 +41,9 @@
 [mergetool]
 	prompt = false
 	keepBackup = false
+	hideResolved = false
+[mergetool "nvimdiff1"]
+	hideResolved = true
 [pager]
 	difftool = true
 [pull]
diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua
index aa86f64..5eda2ad 100644
--- a/nvim/.config/nvim/lua/plugins.lua
+++ b/nvim/.config/nvim/lua/plugins.lua
@@ -25,7 +25,6 @@ local init = function ()
   use 'lewis6991/gitsigns.nvim'
   use 'tpope/vim-fugitive'
   use 'https://github.com/SanchayanMaity/gitlinker.nvim'
-  use 'whiteinge/diffconflicts'
   -- Boost vim command line mode
   use 'vim-utils/vim-husk'
   -- Quickfix