git config --global mergetool.keepBackup false
work email
Merge branch 'osx-work' of github.com:shawndumas/dotfiles into osx-work