I am trying to set up Meld as the external diff and merge tool in Source tree on my Mac laptop. I put down Meld's file path on "Command" as shown in image below. However, when I right click a file and do external diff, the meld GUI just launches but it is not displaying the file or the diffs at all. Am I missing something in the Argument field ?
Second Question: How do I do different kinds of diff (see below) in Sourcetree ?
git diff --cached git diff git diff HEAD
Screen Shot 2014-12-04 at 3.00.12 AM.png
The instructions from https://jira.atlassian.com/browse/SRCTREE-4327 work well for me, I've just done a brew cask install meld, set the diff and merge commands to
and the arguments (as specified by the poster above):
diff: "$LOCAL" "$REMOTE"
merge: "$LOCAL" "$BASE" "$REMOTE" --auto-merge --output="$MERGED"
A vulnerability has been published today in regards to Sourcetree for Windows. The goal of this article is to give you a summary of information we have gathered from Atlassian Community as a st...
Connect with like-minded Atlassian users at free events near you!Find an event
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no Community Events near you at the moment.Host an event