svnX 2.0 Diffmerge setting

52 views
Skip to first unread message

Anh Trinh

unread,
Nov 29, 2017, 7:12:27 AM11/29/17
to svnX
Hi,

I'm trying to use Diffmerge in svnX 2.0.  I have svn binaries and diffmerge.sh in a local directory ~/local/bin which is exported by .profile and able to execute diffmerge.sh to open diffmerge.app.
However, i'm still getting "Can’t find tool ‘diffmerge.sh’ required to use DiffMerge."

diffmerge.sh content
##############################################################################
#!/bin/sh
## A little script to make it easier to launch DiffMerge from the command line.
## Install this script into a folder in your path, such as /usr/bin or /usr/local/bin.
##
## Version 4.2.1.1013
## Copyright (C) 2003-2015 SourceGear LLC. All Rights Reserved.
##############################################################################

## Change DIFFMERGE_PATH to point to where you installed DiffMerge

DIFFMERGE_PATH=/Users/antrinh/Applications/DiffMerge.app

## The actual executable is hidden inside the .app bundle.

DIFFMERGE_EXE=${DIFFMERGE_PATH}/Contents/MacOS/DiffMerge

## Launch DiffMerge using the given command line arguments.  Use --help for
## additional information or see the man page distributed along with this
## shell script.

exec ${DIFFMERGE_EXE} --nosplash "$@"
##############################################################################


does it only work with /usr/bin or /usr/local/bin?

Thanks
Reply all
Reply to author
Forward
0 new messages