commit sample4 to master
Merge branch 'branch1'

* branch1:
  commit sample3.txt to branch1
commit sample5 to branch1
Merge branch 'branch1' of https://github.com/zjbhj/sample into branch1

* 'branch1' of https://github.com/zjbhj/sample:
  commit sample5 to branch1