from dev branch txt
add  devb
creat 2.txt from  master
creat  1.txt from dev
Merge branch 'dev'
master 1.txt
dev 1.txt
master  1.txt
fix  dev 1.txt
1.txt
dev1.txt
Merge branch 'dev'