SublimeText用設定追加
hoge
Merge remote-tracking branch 'origin/master'