From 4ca7557e98634af0d36d8932f042772cc390dd51 Mon Sep 17 00:00:00 2001
From: Hektor Misplon <hektor.misplon@pm.me>
Date: Tue, 31 Dec 2024 14:18:38 +0100
Subject: [PATCH] Use 'nvimdiff' as mergetool

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

diff --git a/.gitconfig b/.gitconfig
index 8302e42..c983603 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -71,7 +71,7 @@
   helper = !/usr/bin/gh auth git-credential
 
 [merge]
-  tool = vimdiff
+  tool = nvimdiff
   conflictstyle = diff3
 [pull]
   rebase = true