From 5ad43aa897bf0f58160a0ebdfac74e40192610e3 Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Tue, 13 May 2025 13:39:24 +0200
Subject: [PATCH] 20250425: use vimdiff with merge conflicts; default git
 branch is 'main'

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

diff --git a/.gitconfig b/.gitconfig
index c4d2253..c363392 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -78,3 +78,7 @@
 #	postBuffer = 1048576000
 #	lowSpeedLimit = 0
 #	lowSpeedTime = 999999
+[init]
+	defaultBranch = main
+[merge]
+	tool = vimdiff