diffに色を付ける
Merge remote-tracking branch 'origin/master'

Conflicts:
	brewfile.sh