vimrc: Treat merges like commits for formatting.