WinMerge

I often have trouble with CVS merge, and so end up comparing the files manually. The problem is that the CVS Revision and Log tags should not show up as a difference. I wanted something similar to “Ignore whitespaces”. For