added IntelliJ as default diff/mergetool
zsh: share history