From baceab2173be9caa629eb30c2f3c2683a3393ffa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= <dev@ensarsarajcic.com>
Date: Fri, 24 Jan 2025 10:45:50 +0100
Subject: [PATCH] Add nvimdiff setup for git

---
 symlinks/gitconfig | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/symlinks/gitconfig b/symlinks/gitconfig
index 364185d..b141890 100644
--- a/symlinks/gitconfig
+++ b/symlinks/gitconfig
@@ -11,11 +11,15 @@
 [diff]
 	tool = nvimdiff
 [difftool]
-	prompt = true
+	prompt = false
+[difftool "nvimdiff"]
+	cmd = "nvim -d \"$LOCAL\" \"$REMOTE\""
 [merge]
 	tool = nvimdiff
 [mergetool]
 	keepBackup = false
+[mergetool "nvimdiff"]
+	cmd = "nvim -d \"$LOCAL\" \"$REMOTE\" \"$MERGED\""
 [guitool "Add to .gitignore"]
 	cmd = echo \"\n$FILENAME\" >> .gitignore & git add .gitignore
 	needsfile = yes