Diff & Merge Tools
One of the very important tools for all programmers is the Diff and Merge, there are many software products out there for diff and merge, here is a useful list of them: http://en.wikipedia.org/wiki/Comparison_of_file_comparison_tools
I personally like the SourceGear DiffMerge http://www.sourcegear.com/diffmerge/index.html
Tell me, what is your favorite diff & merge tool?
