Don't use smartindent
Highlight diff markers