test branch conflict test
master version conflict ceshi
merge
test branch conflict test
master confilct test
second confilct test
fix the confilct
delete confilct
test the delete confilict
fix the master confilct
testbranch delete ccc.txt
master change the content of ccc.txt
master commit the resolve the confilct
add the c1.fi
test the commit
add
add
测试版本合并