From 93831cfac63b5982531a4536f771e5cd94d158e8 Mon Sep 17 00:00:00 2001
From: Pierre-Olivier Mercier <nemunaire@nemunai.re>
Date: Sat, 24 Jan 2026 09:44:36 +0800
Subject: [PATCH] gitconfig: configure autoSetupMerge

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

diff --git a/.gitconfig b/.gitconfig
index cfc2c0a..587d8e5 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -33,3 +33,5 @@
 	required = true
 [init]
 	defaultBranch = master
+[branch]
+	autoSetupMerge = simple