Tuesday, 29 September 2015

Adding WinMerge as your merge tool in SourceTree

Set the merge tool to custom and use this command:
C:\Program Files (x86)\WinMerge\WinMergeU.exe
With these arguments:
-e -u -dl "Mine" -wr -dr "Theirs" $LOCAL $REMOTE $MERGED
Taken from this SO answer

No comments:

Post a Comment

Comments are moderated, so you'll have to wait a little bit before they appear!