I would like to share one good software with you all, for comparing files and folders.
Beyond Compare provides users with extensive side-by-side file comparison and management. Synchronize files between laptop and PC, home and office, etc. Compare directory trees side-by-side with mismatches highlighted. Display text files side-by-side with changes highlighted. Great for merging changes to source code.
Website Link : http://www.scootersoftware.com/index.php