MAC Config svn diff tool Diffmerge

Reference text https://semicrazy.wordpress.com/2009/10/08/using-diffmerge-as-your-subversion-external-merge-tool/

1. Prepare 2 sh files for SVN call

~/scripts/diffmerge/diffmerge-svndiff.sh:

~/scripts/diffmerge/diffmerge-svnmerge.sh:

Reference Sample:

Merge

#!/bin/bashdiffmerge_path=/applications/diffmerge/diffmerge.appdiffmerge_exec=${diffmerge_path}/contents/macos /diffmerge# SVN would invoke this with a bunch of arguments.  These are:# $1-path to the file, that's the original# $2-path to the file, that's the incoming merge version# $3-path To the file that's the latest from trunk (current working copy) # $4-path to where SVN expects the merged output to be W Ritten${diffmerge_exec}--nosplash-m-t1= "Incoming Merge changes"  -t2= "Original (merged)"-t3= "Current working Copy changes "-r=" $4 "$" "$" "$"

Diff is basically a different parameter:

${diffmerge_exec}  -u-t1= "$"  -t2= "$" $6 $7

To set the SVN configuration file (. subversion/config):

Diff-cmd =/users/xxxx/scripts/diffmerge/diffmerge-svndiff.shmerge-tool-cmd =/users/xxx/scripts/diffmerge/ diffmerge-svnmerge.sh

MAC Config svn diff tool Diffmerge