opt/bin/diff-highlight 追加
Merge branch 'master' of github.com:usagi/home