add a test file
:wq
quit

ls
Merge branch 'master' of https://github.com/tobyqingnan/git-test
Merge branch 'master' of https://github.com/tobyqingnan/git-test