branch test
and simple
11
&simple
conflict fixed
11111
merge with no-ff
cimmit1
test
test2
mertge2
清空
simple
再一次清空
dev simple modify
dev no-off modify
no-ff merge
1 + 1 = 3
1+1 merge
222