Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Celebration

Earn badges and make progress

You're on your way to the next level! Join the Kudos program to earn points and save your progress.

Deleted user Avatar
Deleted user

Level 1: Seed

25 / 150 points

Next: Root

Avatar

1 badge earned

Collect

Participate in fun challenges

Challenges come and go, but your rewards stay with you. Do more to earn more!

Challenges
Coins

Gift kudos to your peers

What goes around comes around! Share the love by gifting kudos to your peers.

Recognition
Ribbon

Rise up in the ranks

Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!

Leaderboard

Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
4,555,371
Community Members
 
Community Events
184
Community Groups

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

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.

0 votes
minnsey
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
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

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events