Add meld as merge tool for Git