Having been introduced to KDiff3 via using Kiln in my new job I have been increasing impressed by this Open Source program. KDiff3 provides intuitive file or directory comparison and merging capabilities. The image below (which I have shamelessly stolen from the project site) shows the program in use:

KDiff3

The KDiff3 project homepage looks really basic but don’t let this put you off.