WinMerge (text diff and merge)

winmerge.org

WinMerge is the best text diff and merge software I’ve found yet. It’s difference mapping is amazing and very smart. I can tell when lines have moved in the document and even when pieces of text have moved within a line. The merge feature is very intuitive and easy to use.

Alternate choice: WinDiff