SVN conflict resolution Using FileMerge as a diff command for Subversion Resolving SVN Conflicts with FileMerge.app on OS X eSvn - a GUI frontend to the Subversion revision system Getting SVN keywords to expand, overcoming the lack of support in Textmate
