From c81060660cd61fbd0532d58c1df0f2f985e10122 Mon Sep 17 00:00:00 2001
From: The Magician <themagician@engineer.com>
Date: Sat, 26 Oct 2024 17:02:38 +0100
Subject: [PATCH] Make vimdiff the default Git 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