From e0eb49ed60b7b92d98a99e44852a3d5ab1baad41 Mon Sep 17 00:00:00 2001
From: nsfisis <nsfisis@gmail.com>
Date: Wed, 4 Feb 2026 22:43:04 +0900
Subject: git: disable advice.mergeconflict

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

diff --git a/.config/git/config b/.config/git/config
index 824bd51..4763b50 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -6,6 +6,7 @@
 
 [advice]
     detachedhead = false
+    mergeconflict = false
     skippedcherrypicks = false
 
 [help]
-- 
cgit v1.3-1-g0d28