If you are using Subversion, as we are, you owe it to yourself to check out bbum's entry on Using FileMerge with Subversion.