Modified .gitconfig to use Beyond Compare on Mac.

markcapaldi · Dec 2, 2016 · a547390 · a547390
1 parent 9c63182
commit a547390
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.gitconfig b/.gitconfig
@@ -34,10 +34,10 @@
 [merge]
 	tool = bcom3
 [mergetool "bcom3"]
-	cmd = \"c:/Program Files (x86)/Beyond Compare 3/bcomp.com\" \"$PWD/$LOCAL\" \"$PWD/$REMOTE\" \"$PWD/$BASE\" \"$PWD/$MERGED\"
+	cmd = \"/usr/local/bin/bcomp\" \"$PWD/$LOCAL\" \"$PWD/$REMOTE\" \"$PWD/$BASE\" \"$PWD/$MERGED\"
 	keepBackup = false
 	trustExitCode = false
 [diff]
 	tool = bcom3
 [difftool "bcom3"]
-	cmd = \"c:/Program Files (x86)/Beyond Compare 3/bcomp.com\" \"$LOCAL\" \"$REMOTE\"
+	cmd = \"/usr/local/bin/bcomp\" \"$LOCAL\" \"$REMOTE\"