vimdiff - useful configuration

Say you want vimdiff to open in horizontal mode and also wrap long lines, you just put the below code into your .vimrc:

" for vimdiff
set diffopt+=horizontal
au FilterWritePre * if &diff | exe 'windo set wrap' | endif
" [end] for vimdiff