kill bufferでdiff
Merge remote-tracking branch 'origin/master'

Conflicts:
	init.el
	init.org