From 34fdf1c59ea834c8541f6bb9d382dbd75777416c Mon Sep 17 00:00:00 2001
From: TheSiahxyz <164138827+TheSiahxyz@users.noreply.github.com>
Date: Sun, 21 Sep 2025 17:56:07 +0900
Subject: modified git/config, modified yazi/yazi.toml

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

(limited to 'mac/.config/git')

diff --git a/mac/.config/git/config b/mac/.config/git/config
index 7dc029b..0324918 100644
--- a/mac/.config/git/config
+++ b/mac/.config/git/config
@@ -62,11 +62,11 @@
   diffFilter = delta --color-only
 [merge]
   tool = vscode
-  conflictstyle = diff3
+	conflictstyle = zdiff3
 [mergetool]
   keepBackup = false
 [mergetool "vscode"]
-  cmd = code --wait $MERGED
+	cmd = code --wait --merge $LOCAL $REMOTE $BASE $MERGED
 [pager]
   branch = false
   diff = delta
-- 
cgit v1.2.3