nav[aria-label="Primary Navigation"] { padding: 0; & ul { list-style: none; width: 100%; display: flex; flex-direction: row; justify-content: start; align-items: start; gap: 30px; padding: 0; & li { margin: 0; } & ul li { list-style: none; } } }

Using Meld as External Diff and Merge Tool in Source tree in Mac

thomas ng1

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

Accepted answers

All comments

Seth

The small text at the bottom of that screen explains the variables you can use in "Arguments".

This page explains the arguments that Meld expects: http://meldmerge.org/help/command-line.html

thomas ng1

Yes, I saw those variables but I am not sure how to use them . Can you give me an example please ?

anacrolix

Please give an example. Or would you like the 10 page stack trace I'm getting?

Seth

I use meld as a Visual Diff Tool. I don't think it can be used as a Merge Tool (which is 4-way). My arguments for the diff tool are: $BASE $REMOTE $LOCAL

anacrolix

I had to put PATH=/usr/local/bin:$PATH meld in the Diff command field. I have $LOCAL $REMOTES for the arguments.

I haven't set up merge, but it'll be similar I imagine.

Mick Lang

Did you get this working? If so any chance you could update your question with the configuration you've used?

therightstuff

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

/Applications/Meld.app/Contents/MacOS/Meld

and the arguments (as specified by the poster above):

diff: "$LOCAL" "$REMOTE"

merge: "$LOCAL" "$BASE" "$REMOTE" --auto-merge --output="$MERGED"

Welcome!

It looks like you're new here. Sign in or register to get started.

Quick Links

Find more posts tagged with

sourcetree

external-diff