git diff with “less -r”
update alias
Merge branch 'master' of ssh://140.113.88.190/~/repo/dotfiles

Conflicts:
	gitconfig
Merge remote-tracking branch 'github/master'

Conflicts:
	bash_aliases