added meld to gitmerge tool