Step 1: Download and install TkDiffDownload this from SourceForge, unpack the disk image, and drag the tkdiff application to your Applications directory.
Step 2: Set up an alias to run TkDiff from the command lineIn bash on my machine, I added the following to my PATH in my ~/.bash_profile so I could run it via the command line.
Step 3: Tell Subversion to use TkDiff instead of the default
You'll need an adapter script so Subversion can call TkDiff correctly.
# Configure your favorite diff program here.
# Subversion provides the paths we need as the sixth and seventh
# Call the diff command (change the following line to make sense forThen add the following to ~/.subversion/config to default to this diff method.
# your merge program).
$DIFF $LEFT $RIGHT
diff-cmd = /Users/tgnourse/scripts/tkdiff-svn-wrapper.sh
Step 4: Success!Now you can diff all your edits like so:
svn diffIn addition, TkDiff has built in subversion support so you can also diff single files like so: