.gitconfig: disable merge magic (breaks everything!)