How would SourceTree be set up to use DeltaWalker for diffs?
Ideally, I would like to replace the existing diff tool within sourcetree with deltawalker, but if not, at least I would like to set it up for use as an external diff tool.
I have tried adding the path of DeltaWalker to the Preferences -> Diff -> Other: Diff command, but obviously am doing it wrong.
Is there any simple set of instructions to set this up?
I found instructions here for editing git config by hand.
For SourceTree, you should be able to use the following. If it doesn't work, try varying use of quotes, and double check the paths for your installation:
External Diff Tool: Custom
Diff Command: "/Applications/DeltaWalker.app/Contents/MacOS/git-diff"
Arguments: "$LOCAL" "$REMOTE"
External Merge Tool: Custom
Diff Command: "/Applications/DeltaWalker.app/Contents/MacOS/bzr-git-merge"
Arguments: "$LOCAL" "$REMOTE" "$BASE" "$MERGED"
I know this is an old question, but just in case anyone else comes across it here's the way to do it for Mac:
"$REMOTE" "$LOCAL" -mi -pwd="`pwd`"
"$LOCAL" "$REMOTE" "$BASE" -merged="$MERGED" -mi -pwd="`pwd`"
"Obviously am doing it wrong" - We can't see your screen. What is happening to make this so obvious? Is it still using the old diff tool? Doing nothing? Error message saying "You are doing it wrong"?
See if this (lengthy) question is related to your problem: https://answers.atlassian.com/questions/254737/sourcetree-external-diff-path-issue-on-windows
When I open Preferences -> Diff, there is a section called External Diff / Merge.
I set the "Visual Diff Tool" to other, but have no idea what should be put into the "Diff Command" field or the "Arguments" field.
As per that article you linked to, I tried pasting just the path to DeltaWalker into the "Diff Command" field, and tried pasting in `DiffCommand=/Applications/DeltaWalker.app`
In the "Arguments", i've tried leaving it blank, and tried putting in `$LOCAL $REMOTE`
In all instances, the integrating diff doesn't change, and the "External Diff" button does absolutely nothing.
I cannot find a relevant help article, but assume that all I need is instructions how it ought to be set up.
When I added the commands as you posted them, clicking on "External Diff" opens DeltaWalker.
However, the files do not load - all I get is the errs (have tried with and without the quotes on local/remote):
- (No such file or directory)
- /var/folders/...script.js' has been deleted or is not accessible. To avoid unintentional loss of data, please save your changes or close the comparison window without saving.
- No error, but an empty window.
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
We're bringing product updates and pro tips on teamwork to ten cities around the world.Save your spot