There was a discussion around Meld and other tools just yesterday here at HN: https://news.ycombinator.com/item?id=30741123