From 5393e1eb58cd70354750398f62f6b44ec3d436d7 Mon Sep 17 00:00:00 2001
From: Lee Tang <i@d0zingcat.dev>
Date: Tue, 31 Jan 2023 11:55:55 +0800
Subject: [PATCH] update

Signed-off-by: Lee Tang <i@d0zingcat.dev>
---
 .Brewfile.Darwin.gooddeAir | 1 +
 git/config                 | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/.Brewfile.Darwin.gooddeAir b/.Brewfile.Darwin.gooddeAir
index 263bb15..db8a05d 100644
--- a/.Brewfile.Darwin.gooddeAir
+++ b/.Brewfile.Darwin.gooddeAir
@@ -59,6 +59,7 @@ cask "bartender"
 cask "brave-browser"
 cask "charles"
 cask "clash-for-windows"
+cask "dash"
 cask "datagrip"
 cask "discord"
 cask "docker"
diff --git a/git/config b/git/config
index a5bf18a..4ef8fe3 100644
--- a/git/config
+++ b/git/config
@@ -58,3 +58,9 @@
 #[mergetool "sourcetree"]
 #	cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
 #	trustExitCode = true
+[difftool "sourcetree"]
+	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
+	path = 
+[mergetool "sourcetree"]
+	cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
+	trustExitCode = true