.gitconfig: add merge diff option and some aliases