gitconfig: added alias for merge