From 7dd5258f9baa4cd965a84f87d203dc97521719d2 Mon Sep 17 00:00:00 2001
From: Andrei Stoica <andrei.stoica.365@gmail.com>
Date: Wed, 31 Jan 2024 20:40:40 -0500
Subject: [PATCH] nvim for git diff

---
 .gitconfig | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.gitconfig b/.gitconfig
index a44d5d2..8ec8a94 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -20,3 +20,9 @@
 	autocrlf = input
 [init]
 	defaultBranch = main
+[merge]
+	tool = nvim
+[mergetool]
+	keepBackup = false
+[mergetool "nvim"]
+	cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'