.gitconfig: add autocrlf = false, merge use diff3
[cmccabe-etc] / xmodmap / caps-lock-to-control.xmodmap.conf
2013-03-07 Colin Patrick MccabeAdd xmodmap confs