- Install meld
- Add location of
meld.exe
to the PATH, e.g.C:\Program Files (x86)\Meld
- In SourceTree, go to Tools/Options/Diff
- In
External Diff Tool
, chooseCustom
- Enter
meld
inDiff Command
and$LOCAL $REMOTE
inArguments
- Click Ok and restart SourceTree
-
-
Save chinhodado/6fc37def3e12ea09f785 to your computer and use it in GitHub Desktop.
Did this break for anyone else when moving to version 1.8 of sourcetree?
Yep, the settings for this were removed - probably.
This worked for me, but I had to type this for it to work instead of what was suggested: meld.exe
Step 2, what is the PATH? Is that a setting in Sourcetree?
I know the path to Meld.exe, I'm just not sure where I'm putting that info.
Just to add to the previous comments and question from @vadimnehta
You can add escaped quotes around the variables to handle files with spaces in the path or name.
\"$LOCAL\" \"$MERGED\" \"$REMOTE\"
For Meld for OSX
Diff Command:
/Applications/Meld.app/Contents/MacOS/Meld
Diff Command Arguments:
$LOCAL $REMOTE
Merge Tool
/Applications/Meld.app/Contents/MacOS/Meld
Merge Tool Arguments:
--auto-merge $LOCAL $BASE $REMOTE --output=$MERGED
using 8.3 file names did the trick for me.