Set diffopt=vertical in .vimrc.