Vim makes it amazingly hard to disable folding, especially when using vimdiff. None of the above posted solutions worked for me, but this did (add to ~/.vimrc):
au WinEnter * set nofen au WinLeave * set nofen