ok
merging branch1
Merge branch 'branch1'
k
pull
Merge branch 'master' of github.com:zhoubw/fork-test