ignore whitespace in vimdiff, disable mydiff
ignore whitespace in vimdiff, disable mydiff
Merge branch 'control-p'
enable ruby syntax for pp files
Merge branch 'master' into tabsindent