External Diff/Merge Tool Arguments

Hi, I'm using SourceTree 2.3.1.0.

I use external diff/merge(LVCompare, LVMerge) tool to work with my LabVIEW files. These external tools need the absolute path of the files I want to compare/merge.

But somehow, I think the arguments I use ($PWD $BASE $REMOTE $LOCAL $MERGED) doesn't output correct absolute path to my external tools. They just output relative path.

I remember at previous version(maybe at 1.x.x.x), these work fine. I've launch external tools perfectly before.

 

Please help, thanks!

Capture.PNG

3 answers

0 votes

Hi

I can't honestly remember if we ever changed that but we will look at it.

Can you add the configuration you use to https://jira.atlassian.com/browse/SRCTREEWIN-8078

Thanks

I'm also having problems with recent versions of SourceTree. I massaged some scripts that worked from Q1 2017 versions through Q4 2017, but I haven't been able to use the external diff well since. The way I had it working is at our website, but that only works for diffs in the log window now, not for diffs from the file status display. Seems to have changed post 2.4ish.

Alan,

Have a look at this solution from NI.

https://github.com/smithed/vicompare

This seems great, thanks for the update!

Like 1 person likes this

Suggest an answer

Log in or Sign up to answer
Community showcase
Published Oct 23, 2018 in Sourcetree

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

844 views 3 2
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you