From f496e01a0dfcb89879d59b50a0052ef23f398c62 Mon Sep 17 00:00:00 2001
From: The Magician <themagician@engineer.com>
Date: Fri, 26 Jul 2024 13:18:53 +0100
Subject: [PATCH] Set vimdiff as default mergetool

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

diff --git a/git/.gitconfig b/git/.gitconfig
index 4391554..8612cf6 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -3,3 +3,5 @@
 [user]
 	name = The Magician
 	email = themagician@engineer.com
+[merge]
+	tool = vimdiff