a aaaa
bbbbb
add b.txt again
Merge branch 'develop' of https://github.com/haitaowu/logwu into develop
modif b.txt
for conflict
resolve conflict
delete a.m file
delete b?
modify used.txt file
diff practice
Merge branch 'develop' of https://github.com/haitaowu/logwu
prepare merge to master