.gitconfig: add autocrlf = false, merge use diff3
[cmccabe-etc] / .mtoolsrc
2010-04-25 Colin Patrick McCabesuppress nosy mtools warnings