WinMerge is a text file differencing tool for Windows. It can highlight and reconcile entire directory trees of files, showing you exactly what has changed and where between any two versions of the faile or directory tree being examined.