DiffMerge is a file comparison tool that shows the differences between two or three text files in a graphical side-by-side view. You can easily spot the parts that are different and choose to edit or merge them...
