dev分支上增加内容7777
branch fenhi1:添加内容8888
branch master 添加内容9999
conflict fixed
add merge
merge with no-ff
master commit after dev and dev-child modify
dev-bug modify bug
dev code completed
bug conflict fixed
bug b.txt
dev modify b.txt
dev branch merge bug
dev merge master test
master merge on b.txt