Meld is a visual diff and merge tool targeted at developers

334 points by danielsokil

Read the article

Discussion on Hacker News