Difference between revisions of "How to use Meld with SourceTree"
From Logic Wiki
(Created page with "Category:Tips Category:GIT # 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 Exte...") |
|||
| Line 6: | Line 6: | ||
# 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 | ||
| − | # Enter meld in Diff Command and $LOCAL $REMOTE in Arguments | + | # 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 | # Click Ok and restart SourceTree | ||
Revision as of 14:37, 23 March 2017
- 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, 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
