Visual Diff Tool: Kaleidoscope

I'm enjoying Sourcetree more and more from day to day.

One thing I can't get to owrk is to open Kaleidoscope as external Diff-Tool. Sourcetree opens Filemerge when I click on External Diff although I configured it in the preferences.

1 answer

1 accepted

Hmm, that's odd because I use Kaleidoscope myself as my preferred tool. Is this git? If so, please post your ~/.gitconfig file so I can take a look, perhaps there's a setting in there which is overriding it.

the interesting part:

[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

Yeah, that's clearly FileMerge, it's got out of sync somehow where ST thinks it's set it to something else already. Can you try setting the diff & merge tools to something else, closing the Preferences panel, then re-opening it and setting it to Kaleidoscope again? Please close the Prefs window after doing that and it should update the file.

Oh, my. I am going mad. Looks like my .gitconfig file permissions is messed up. No changes are stored although I selected it in the setup process. Is there a way to rebuild this file from scratch.

Hmm, does "ls -l" indicate that permissions on this file are incorrect?

In any case, if you want to build the file from scratch, you can simply rename it to something else like ~/.gitconfig_bak and SourceTree will re-create it for you.

Has something todo with my User directory. I use a Mac and I my user directory is on a second drive. Seems like Sourcetree dosn't store in that place. I created another user on my first drive and configured via sourcetree and then copied the .gitconfig to my first users folder. Now it works.

Suggest an answer

Log in or Sign up to answer
Atlassian Community Anniversary

Happy Anniversary, Atlassian Community!

This community is celebrating its one-year anniversary and Atlassian co-founder Mike Cannon-Brookes has all the feels.

Read more
Community showcase
Brian Ganninger
Published Jan 23, 2018 in Sourcetree

Tip from the team: workflow and keyboard shortcuts

Supported Platforms macOS Sourcetree has a lot to offer and, like many developer tools, finding and using it all can be a challenge, especially for a new user. Everyone might not love ...

649 views 0 4
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you