As a developer, I have found WinMerge (on SourceForge) a crucial free tool. I use it for comparing similar files and merging their various sections.
Highly recommended!
