使用sublime的git插件
Merge branch 'master' of github.com:yiqiang3344/yjq