What's the best CVS client for Windows?
We're currently using WinCVS but it's slow and has no merge dialog. I'm looking for something like Eclipse's Team Synchronize (so people can see what they'll get before they update).

What do you suggest? <a href="http://www.tortoisecvs.org/">TortoiseCVS</a> with <a href="http://winmerge.org/">WinMerge</a>?

Note: OSS preferred :)
What's the best CVS client for Windows?
===

We're currently using WinCVS but it's slow and has no merge dialog. I'm looking for something like Eclipse's Team Synchronize (so people can see what they'll get before they update).

What do you suggest? <a href="http://www.tortoisecvs.org/">TortoiseCVS</a> with <a href="http://winmerge.org/">WinMerge</a>?

Note: OSS preferred :)