From cf061d3779dbdbf591dca63c7e8a2f372fb82b28 Mon Sep 17 00:00:00 2001
From: Sonny Bakker <sonny871@hotmail.com>
Date: Tue, 16 Jul 2024 11:08:02 +0200
Subject: [PATCH] Set default git mergetool

---
 templates/gitconfig.j2 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/templates/gitconfig.j2 b/templates/gitconfig.j2
index 3c1e9d9..8391d19 100644
--- a/templates/gitconfig.j2
+++ b/templates/gitconfig.j2
@@ -8,3 +8,6 @@ editor = nvim
 
 [pull]
 rebase = false
+
+[merge]
+tool = nvimdiff