From cf13273896c7e042869881f5ca66fca3e174632f Mon Sep 17 00:00:00 2001
From: masterzu <master.h2zu@gmail.com>
Date: Thu, 28 Nov 2024 23:36:10 +0100
Subject: [PATCH] git config merge.tool=vimdiff1

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

diff --git a/.gitconfig b/.gitconfig
index aaefbaa..7d88044 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -22,3 +22,5 @@
 	signingkey = A8F721C80E43073F40DF8F21B57DBE40C72FBCF4
 [commit]
 	gpgsign = true
+[merge]
+	tool = vimdiff1