KDiff3 - Comparing and Merging the Text files

http://kdiff3.sourceforge.net/

Open Source Tool for comparing and merging the text files.
aka tool used in SCM Systems (clearcase) to resolve the merge conflicts.