edit 4.txt
Merge branch 'dev' of github.com:chinasoul/learngit2 into dev