FileMerge and Subversion
Bill wrote up a blurb on using FileMerge with Subversion which reminded me that I had already written a couple of tools in that vein, so I've posted them on Red-Bean.
svn-viewdiff wraps the command line interface of GNU diff around FileMerge and is useable as a diff-cmd with Subversion (--diff-cmd argument to svn diff or edit ~/.subversion/config to make it the default. This sets the merge target to the working copy, so if you deselect diffs in FileMerge and save, it will save to your working copy. I find this handy for quickly undoing debug code before committing.
svn-resolve is a tool to facilitate using FileMerge to resolve merge conflicts after an svn update or svn merge. It uses FileMerge as a three-way merge tool, allowing you to select which diff to take from which file.