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?
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.
Badges are a great way to show off community activity, whether you’re a newbie or a Champion.Learn more
...staring into the background. Once the image pops out in 3D, you can look around the picture and enjoy. If you will see if you are a true illusion master! :) You did it? :) Wow! Awesome! As a bonus...
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!
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