better svndiff
Merge branch 'master' of github.com:emanueldima/config

Conflicts:
	.bashrc