Skip to content

Commit

Permalink
SourceTree to play nice with Kaleidoscope
Browse files Browse the repository at this point in the history
  • Loading branch information
Dondi committed Jan 11, 2013
1 parent 92655cd commit e76e9ac
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion gitconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
keepBackup = true
prompt = false
[difftool "sourcetree"]
cmd = /Applications/Kaleidoscope.app/Contents/MacOS/ksdiff -w \"$LOCAL\" \"$REMOTE\"
cmd = /usr/local/bin/ksdiff -w \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
Expand Down

0 comments on commit e76e9ac

Please sign in to comment.