add kenytest.txt
add aa.txt
add cc
Merge branch 'b1'
master modify test.txt
b2 add abcd.txt
b2 add ajc.txt