.gitconfig: add autocrlf = false, merge use diff3
[cmccabe-etc] / .mplayer /
drwxr-xr-x   ..
-rw-r--r-- 256 config