Adding diffmerge to gitconfig; alias for git branch to bash_aliases.