Alfio Puglisi wrote:
Tortoise CVS works very well, but for diffs and other cvs features on windows you need to install the windows port of binutils (for example from http://sourceforge.net/project/showfiles.php?group_id=2435 ).
Or just use the built-in Tortoise versions of those features (potentially replacing TortoiseMerge with something like Beyond Compare if you do a lot of it)...
Ben