Don't keep backup files in git mergetool
Add .inputrc
Merge branch 'master' of github.com:fmahnke/fritz-shell