From be00d3d0fc25855c3f019556f41690125097983a Mon Sep 17 00:00:00 2001
From: Andrew Tomaka <atomaka@atomaka.com>
Date: Thu, 19 Sep 2024 08:54:57 -0400
Subject: [PATCH] Use nvim for diffing

---
 git/.gitconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git/.gitconfig b/git/.gitconfig
index dfd17da..dbf627d 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -23,7 +23,7 @@
   program = gpg
 
 [merge]
-  tool = vimdiff
+  tool = nvim -d
 
 [pull]
   rebase = false