Meld is a visual diff and merge tool targeted at developers