From fcc8b40151e21ca8eec53d35f8d77b89d1b03f88 Mon Sep 17 00:00:00 2001
From: punkfairie <23287005+punkfairie@users.noreply.github.com>
Date: Sun, 10 Mar 2024 13:33:50 -0700
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(git):=20autoSetupMerge?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/.config/git/config b/.config/git/config
index 57047c1..332287a 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -102,6 +102,8 @@
   # Show most recently changed branches first.
   sort = -committerdate
 
+  autoSetupMerge = simple
+
 [url "git@github.com:"]
 	insteadOf = @gh: