.gitconfig: add autocrlf = false, merge use diff3
[cmccabe-etc] / .vim /
drwxr-xr-x   ..
drwxr-xr-x - autoload
drwxr-xr-x - doc
drwxr-xr-x - ftdetect
drwxr-xr-x - indent
drwxr-xr-x - plugin
drwxr-xr-x - syntax