Compare and merge files using Free WinMerge,
http://www.8downloads.com/winmerge/
This video will show you how you can compare or merge text files using free winmerge. WinMerge is an Open Source differencing and merging tool for Windows. WinMerge can compare both folders and files, presenting differences in a visual text format that is easy to understand and handle.