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.
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
To answer “How scrum works,” most of the teams I've worked with first addressed the question: “where to start?” That question applies to both implementation and improvements on the Scrum framew...
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!
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