Add diffmerge to git global config

Add ls colours configuration in zsh.