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"