The Atlassian Community Forums are currently in read-only mode. We will be relaunching on a new platform on September 22 (read more here). We apologize for the extended downtime. For concerns or questions, please email communitymanagers@atlassian.com. See you on the other side, on the new Atlassian Community Forums! :)

×

Forums

Articles
Create
cancel
Showing results for 
Search instead for 
Did you mean: 

Correct way to Set up External Diff Tool

Xun Cai
February 24, 2012

Hi

I am trying to set up the external Diff Tool and merge tool:

I put the path: /Applications/syncroSVNClient7/DiffFiles.app in Diff Command

and I put $LOCAL $REMOTE as Arguments:

And I do the samething for Merge Tool but it doesn't work.

Can someone tell me the correct way to do this?

1 answer

Comments for this post are closed

Community moderators have prevented the ability to post new answers.

0 votes
stevestreeting
Rising Star
Rising Star
Rising Stars are recognized for providing high-quality answers to other users. Rising Stars receive a certificate of achievement and are on the path to becoming Community Champions.
February 26, 2012

The Merge tool will require 3 parameters rather than 2 for a 3-way merge.

Otherwise, it depends if this client app supports external diffing from git/mercurial - I've never tried Synchro SVN before. Certainly the 'Other' option has been proven to work with other tools which aren't officially supported, such as MacVim, using this same setup.

TAGS
AUG Leaders

Atlassian Community Events