This comparison utility is a great general-purpose comparison tool. It even has a plug-in architecture that allows one to add additional comparison plugins for different file types. It could be extended to handle merging jobs better- that's about the only thing that is missing- you can accomplish merging jobs but there is no special support for merging. Another tool, also based on BeyondCompare is the Beyond Compare IDE Expert available for Delphi 2006 and 2007.