Difference between revisions of "How to use Meld with SourceTree"
From Logic Wiki
| Line 3: | Line 3: | ||
# Install meld | # Install meld | ||
| − | # Add location of meld.exe to the PATH, e.g. C:\Program Files (x86)\Meld | + | # Add location of meld.exe to the PATH, e.g. C:\Program Files (x86)\Meld or you can enter full path in steps 5 and 7 |
# In SourceTree, go to Tools/Options/Diff | # In SourceTree, go to Tools/Options/Diff | ||
# In External Diff Tool, choose Custom | # In External Diff Tool, choose Custom | ||
Revision as of 10:40, 24 March 2017
- Install meld
- Add location of meld.exe to the PATH, e.g. C:\Program Files (x86)\Meld or you can enter full path in steps 5 and 7
- In SourceTree, go to Tools/Options/Diff
- In External Diff Tool, choose Custom
- Enter meld in Diff Command and $LOCAL $REMOTE in Arguments
- In Merge Tool, choose Custom
- Enter meld in Diff Command and $LOCAL $BASE $REMOTE --auto-merge --output=$MERGED in Arguements
- Click Ok and restart SourceTree
