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

WebStorm as a SourceTree external diff tool

I prefer WebStorm as a diff tool but it doesn't work with SourceTree. I can successfully run a diff from the command line like so:

webstorm.exe diff c:\a.txt c:\b.txt

But setting up a similar thing in SourceTree just results in WebStorm opening and straight away closing - which seems to be the behaviour when it can't find either file. I have the following in the SourceTree Diff settings:

Diff Command: C:\Program Files (x86)\JetBrains\WebStorm 131.130\bin\WebStorm.exe

Arguments: diff $LOCAL $REMOTE

Will $LOCAL and $REMOTE return absolute paths?

Incidentally merge also fails in the same way.

Thanks for any help.

Tim

3 answers

Diff command:

/Applications/WebStorm.app/Contents/MacOS/webstorm

Arguments: 

diff $LOCAL $PWD/$REMOTE
$PWD/ on the remote path did the trick!
I tested DIFF on OS X Yosemite & latest versions of WS and ST. It should be analogue on Windows.


Please be careful with extra empty spaces. Full path is needed, even if the parent dir is on $PATH

See also: intellij-diff-tool-in-sourcetree

I have the same problem.

same here

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Sourcetree

Sourcetree for Windows - CVE-2019-11582 - Remote Code Execution vulnerability

A vulnerability has been published today in regards to Sourcetree for Windows.  The goal of this article is to give you a summary of information we have gathered from Atlassian Community as a st...

3,704 views 0 11
Read article

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