Meld - a great visual diff and merge tool for linux

96 points by tagnu_

Read the article

Discussion on Hacker News