Just curious what tools people use for diff and merge operations on Win32 platforms. I have 100's of files that I need to diff to see what changes I've made over the last couple of months.

I often find myself needing to diff directories of files. I've tried using FileMerge, but it is horribly broken for my application because often these files I need to diff have different line endings, ...