Compensate for 'noequalalways' in merge diff
tree754711ca79bbbf6f189bc481d5d0b1be6633ba2a
-rw-r--r-- 45 .gitattributes
-rw-r--r-- 10 .gitignore
-rw-r--r-- 1494 CONTRIBUTING.markdown
-rw-r--r-- 5046 README.markdown
drwxr-xr-x - autoload
drwxr-xr-x - doc
drwxr-xr-x - ftdetect
drwxr-xr-x - plugin
drwxr-xr-x - syntax