Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Deleted user
0 / 0 points
Next:
badges earned

Your Points Tracker
Challenges
Leaderboard
  • Global
  • Feed

Badge for your thoughts?

You're enrolled in our new beta rewards program. Join our group to get the inside scoop and share your feedback.

Join group
Recognition
Give the gift of kudos
You have 0 kudos available to give
Who do you want to recognize?
Why do you want to recognize them?
Kudos
Great job appreciating your peers!
Check back soon to give more kudos.

Past Kudos Given
No kudos given
You haven't given any kudos yet. Share the love above and you'll see it here.

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

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

Alan,

Have a look at this solution from NI.

https://github.com/smithed/vicompare

This seems great, thanks for the update!

Like UPWT likes this
0 votes
minnsey Atlassian Team Oct 20, 2017

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.

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published 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...

3,265 views 4 5
Read article

Community Events

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

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you