(vim) status line を表示
Merge branch 'master' of github.com:pocke/dotfiles

Conflicts:
	.vimrc