From c873b524c964066ad7184a0634966f4876082777 Mon Sep 17 00:00:00 2001
From: tmont <tommy.mont@gmail.com>
Date: Tue, 4 Dec 2018 14:01:07 -0800
Subject: [PATCH] fixed diffmerge path

---
 .gitconfig-mac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitconfig-mac b/.gitconfig-mac
index c400054..eef2efb 100644
--- a/.gitconfig-mac
+++ b/.gitconfig-mac
@@ -20,4 +20,4 @@
 	tool = diffmerge
 [mergetool "diffmerge"]
 	trustExitCode = true
-	cmd = /usr/local/bin/diffmerge --merge --result="$MERGED" "$LOCAL" "$BASE" "$REMOTE"
+	cmd = /Applications/DiffMerge.app/Contents/Resources/diffmerge.sh --merge --result="$MERGED" "$LOCAL" "$BASE" "$REMOTE"