write a txt
first modify
second change
rm file
add
Merge branch 'master' of github.com:weijing24/learngit