I like subversion, and it's even better with beyond compare

This post describes how to tie the two together.
In my svn settings file, the relevant line looks like
diff-cmd = "C:\Program Files\Beyond Compare 3\BComp.exe" "%6" /title1=%3 "%7" /title2=%5
Enjoy!