.gitconfig: reindent, set merge-tool vimdiff
[cmccabe-etc] / .inputrc
2014-05-21 Colin Patrick Mccabeadd .inputrc to work around jline bug