automagic display of diff when editing commit message
Merge branch 'master' of https://github.com/leejo/code

Conflicts:
	dot_files/gitconfig