It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

Visual Diff Tool: Kaleidoscope

Jupp Schwupp Apr 25, 2012

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

0 votes
Answer accepted
Steve Streeting Apr 25, 2012

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.

Jupp Schwupp Apr 25, 2012

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

Steve Streeting Apr 25, 2012

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.

Jupp Schwupp Apr 25, 2012

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.

Steve Streeting Apr 25, 2012

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.

Jupp Schwupp Apr 26, 2012

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
This widget could not be displayed.
This widget could not be displayed.
Community showcase
Posted in Sourcetree

[dev team] Sourcetree for Windows 2019 Preview - Dark Theme

Hi folks, While the full post is over on our blog I'd like to share the dark theme we've got planned for 2019 here directly as well to keep the discussion going.  The ...

1,968 views 14 18
Join discussion

Community Events

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

Find an event

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

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you