I have been using the following tool to file comparing for around two years now.Thought this would be useful to many if I share it here.With CompareIt you can compare,Merge two files and can generate a report on the differences.The two files selected for comparision are placed side by side vertically and the differences are show by colour codes.The latest version of the software is CompareIt 3.86 and will be around 1MB in size.Although the alpha version of the CompareIt 4 is open, better go with CompareIt 3.86.
Features1]Lets you edit at the same time you are comparing two files.
2]Comes with built-in syntax highlighting for C/C++,Java,C# etc.
3]Supports Word wrapping.
4]Comes with easy to remember keyboard shortcuts.
Links