commit readme.txt to dev branch
The last commit is wrong,this is right
commit readme.txt to branch feature1
commit readme.txt to master
commit readme.txt to master
merge over
modify readme.txt
modify is over
ok
again