diffmergeに変更
boot2docker.zsh, aliases.zsh, 11-phpenv.zsh
gvimrc, rbenv_phpenv, typeset