nav[aria-label="Primary Navigation"] { padding: 0; & ul { list-style: none; width: 100%; display: flex; flex-direction: row; justify-content: start; align-items: start; gap: 30px; padding: 0; & li { margin: 0; } & ul li { list-style: none; } } }

WebStorm as a SourceTree external diff tool

timneil_mv91sd

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

Accepted answers

All comments

mstocki

I have the same problem.

mrcybermac

same here

ricardo15

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

Welcome!

It looks like you're new here. Sign in or register to get started.

Quick Links

Find more posts tagged with

sourcetree

diff

webstorm