set diffopt+=filler " show filler lines
set diffopt+=vertical " always vertical split
set diffopt+=iwhite " ignore white space
set diffopt+=filler " show filler lines
set diffopt+=vertical " always vertical split
set diffopt+=iwhite " ignore white space