add a test file from my git
dd
commit e file
do a commit
Merge branch 'master' of git://github.com/liucailin/hello-world

merge from hello-world