KDiff3 - graphical diff and merge tool released

KDiff3 is a new diff tool that compares two or three text files not only line-by-line but character-by-character. It also merges two or three files and contains an integrated editor for solving conflicts.
Check it out at http://kdiff3.sourceforge.net !