From 96aa7aec83c007c140c64390d05cac54affe6033 Mon Sep 17 00:00:00 2001
From: Sanchayan Maity <sanchayan@sanchayanmaity.net>
Date: Tue, 3 May 2022 09:42:48 +0530
Subject: [PATCH] git: Use nvimdiff1 as the merge tool

The feature provided by the vim-diffconflicts plugin seems to have been
merged upstream. Use of nvimdiff1 should now suffice.

See https://www.eseth.org/2020/mergetools.html

There also seems to be a new proposal adding layout support which will
be interesting once merged.
https://lore.kernel.org/all/20220327112307.151044-1-greenfoo@u92.eu/
---
 git/.gitconfig | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/git/.gitconfig b/git/.gitconfig
index de3b8aa..8c3a206 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -26,15 +26,12 @@
 [difftool "kitty"]
     cmd = kitty +kitten diff $LOCAL $REMOTE
 [merge]
-	tool = diffconflicts
+	tool = nvimdiff1
 	conflictstyle = zdiff3
 	ff = only
 [mergetool]
 	prompt = false
 	keepBackup = false
-[mergetool "diffconflicts"]
-	cmd = nvim -c DiffConflicts $MERGED $BASE $LOCAL $REMOTE
-	trustExitCode = true
 [rebase]
 	autosquash = true
 	autoStash = true