Comparing Files

There are many software for comparing, I would like to recommend following

1. Beyond Compare ( http://www.scootersoftware.com )

Beyond Compare 3 is the ideal tool for comparing files and folders on your Windows or Linux system. Visualize changes in your code and carefully reconcile them.