Diff and Merge for Windows

I am not aware of such an elegant tool until recently. I was always reluctant to use KDiff 'cause it is always make me confused.

Check out WinMerge.
http://winmerge.org/