.gitconfig: use meld as merge tool