3 great diff merge tools that can be used to compare files, directories of files and merge them.
- WinMerge is an Open Source visual text file differencing and merging tool for Win32 platforms. It is highly useful for determing what has changed between project versions, and then merging changes between versions.
- DiffMerge is an application to visually compare and merge files for Windows, Mac OS X and Unix.
- KDiff3 is another cross platform merge tool.